From patchwork Wed Apr 15 07:39:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11490027 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7EEC16CA for ; Wed, 15 Apr 2020 07:41:19 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5D9FA20771 for ; Wed, 15 Apr 2020 07:41:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="MAan9yGD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5D9FA20771 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D5CB56E883; Wed, 15 Apr 2020 07:40:54 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id D66286E886 for ; Wed, 15 Apr 2020 07:40:53 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id c195so14279274wme.1 for ; Wed, 15 Apr 2020 00:40:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9wfbO1Jqe5e6cwYH9JeJEjOOTIsj3e6V9giYISJ/AnA=; b=MAan9yGDSaWf1/Hd4FP4F5jAJWTiFH7UaRXlSL4KoIIFK591ee3ITspW2GHTfPTtZp MVD8+Im9c1yOq8QyYzq/EKW1Sm+c7Ns957xgwVZ28fS2vfjp8BzF/9zlnKOoQdr7MFko 69/JIzpO9gsrN2kYS53+u9wJVAQrMW29m2ts0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9wfbO1Jqe5e6cwYH9JeJEjOOTIsj3e6V9giYISJ/AnA=; b=rh6OAImkt7WR8nmubAKZKXFU7Dj1/Bfud9J4vdcQ0AMBCNcEc4C0JXdLckWPyJ0LUo Jovt1Bgz45rmEIk0k1R7shWpr8dekk5iHsNu15fak1GVyx4JHCsZqj+rgijJ3YP0Kepc J1kR+0hjUefq/OcZHLH2nqAmU4UfjNb1yzHwf1CAv9hEfN0eVJGr8Dfb/MZR0YSTqnG3 WqbyVVbCcXBtSKAhgvFqNQJ/pNeV/ysYfPXaT94YpKe8hWeeMQdf8MFYN6iFo3suaMiP w+rOlBiADGNNnT/nyTJNhWfTimqoua7koKv2SqOn1M05tlPAI+9ysS4JdQjOYXmxkwhR aCiw== X-Gm-Message-State: AGi0PuYGigcO3K07W3d9pY6UNpVuzqkT1pmAjCVJt+CxP8SDr2isCbwT 1hi3rntMrY8AfJhJizxq15ui/4swNoU= X-Google-Smtp-Source: APiQypK+eNM+4aerepkRC7dCXjPZgfA8nX0kC7FDrhk2m9V7yKhZDXLQ+Rc/jOShUBzb7deRjZUSdA== X-Received: by 2002:a05:600c:2c04:: with SMTP id q4mr3633023wmg.7.1586936452227; Wed, 15 Apr 2020 00:40:52 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id u30sm1878552wru.13.2020.04.15.00.40.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 00:40:51 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Wed, 15 Apr 2020 09:39:46 +0200 Message-Id: <20200415074034.175360-12-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200415074034.175360-1-daniel.vetter@ffwll.ch> References: <20200415074034.175360-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 11/59] drm/udl: Use devm_drm_dev_alloc X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sam Ravnborg , Daniel Vetter , DRI Development , =?utf-8?q?Noralf_Tr?= =?utf-8?q?=C3=B8nnes?= , Thomas Zimmermann , Daniel Vetter , Dave Airlie , Thomas Gleixner Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Also init the fbdev emulation before we register the device, that way we can rely on the auto-cleanup and simplify the probe error code even more. v2: Rebase on top of Thomas' patches to remove the return value from drm_fbdev_generic_setup() Signed-off-by: Daniel Vetter Cc: Noralf Trønnes Cc: Dave Airlie Cc: Sean Paul Cc: Thomas Zimmermann Cc: Daniel Vetter Cc: Emil Velikov Cc: Sam Ravnborg Cc: Thomas Gleixner Reviewed-by: Thomas Zimmermann Acked-by: Sam Ravnborg --- drivers/gpu/drm/udl/udl_drv.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 9cc6d075cb40..523f60e02a85 100644 --- a/drivers/gpu/drm/udl/udl_drv.c +++ b/drivers/gpu/drm/udl/udl_drv.c @@ -57,27 +57,20 @@ static struct udl_device *udl_driver_create(struct usb_interface *interface) struct udl_device *udl; int r; - udl = kzalloc(sizeof(*udl), GFP_KERNEL); - if (!udl) - return ERR_PTR(-ENOMEM); - - r = drm_dev_init(&udl->drm, &driver, &interface->dev); - if (r) { - kfree(udl); - return ERR_PTR(r); - } + udl = devm_drm_dev_alloc(&interface->dev, &driver, + struct udl_device, drm); + if (IS_ERR(udl)) + return udl; udl->udev = udev; udl->drm.dev_private = udl; - drmm_add_final_kfree(&udl->drm, udl); r = udl_init(udl); - if (r) { - drm_dev_put(&udl->drm); + if (r) return ERR_PTR(r); - } usb_set_intfdata(interface, udl); + return udl; } @@ -93,17 +86,13 @@ static int udl_usb_probe(struct usb_interface *interface, r = drm_dev_register(&udl->drm, 0); if (r) - goto err_free; + return r; DRM_INFO("Initialized udl on minor %d\n", udl->drm.primary->index); drm_fbdev_generic_setup(&udl->drm, 0); return 0; - -err_free: - drm_dev_put(&udl->drm); - return r; } static void udl_usb_disconnect(struct usb_interface *interface) @@ -113,7 +102,6 @@ static void udl_usb_disconnect(struct usb_interface *interface) drm_kms_helper_poll_fini(dev); udl_drop_usb(dev); drm_dev_unplug(dev); - drm_dev_put(dev); } /*