From patchwork Fri Apr 3 13:57:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11472757 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 D44B417EA for ; Fri, 3 Apr 2020 13:59:22 +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 B2E822077D for ; Fri, 3 Apr 2020 13:59:22 +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="XR4DTDiW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B2E822077D 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 087D86EB96; Fri, 3 Apr 2020 13:58:55 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0B16C6EBA8 for ; Fri, 3 Apr 2020 13:58:54 +0000 (UTC) Received: by mail-wm1-x344.google.com with SMTP id r16so7249959wmg.5 for ; Fri, 03 Apr 2020 06:58: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=rcj6BayWka2EitDRdS6u20GaaWgPfY4TfOGuURPK+fk=; b=XR4DTDiWVSUSqs0ZrqPlwuJ0qiB8Rz6sFtdzIpsaYWEeRBe4Jgcpv+k11obBKjvf2Z +AbXnPz55X4kQMkfdIN6FqI+e3mcuLQswmN3H29XaF1lappzEhFyg0wxxGnU1ONOhzot 4Hjxn3J1Sl38BCQ2YGJrxZzxx0TUMhGnkGN+A= 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=rcj6BayWka2EitDRdS6u20GaaWgPfY4TfOGuURPK+fk=; b=Mt8sBPvgViyDma8yoxtEgYBN4sDEr4JBkQUWv2bhNK6icZbz1b+KrE7O4biQNmJ+QK JOBvM76UfBxkvFHgwk0zMRhukXPHz+DkQ3deyvFbfA0+yJYVjG9BoP45J4dLAn5oEWUt OMUif2syatA4S81LsR4AsYOg5J5wUzoyOuFXbiL5ejtnnGriHpqksSO0VUqljjxGtj3j PW3N7kBs3dwGMlLDgmwPWK+hqfGoDJIx4Rxo5g/ewqo0n5Lvq0pyWQBApnVLY4RaY1Zx jhlPTZQLdEnSSoqepTF2eRupsHVpTrnlXoyPF5hk5zSKPwba/i6ffEEpOAsisB6SBwS2 F0Ug== X-Gm-Message-State: AGi0Pub2/vMtTamXsDElpR4jKMC+p3KMYEX+HIwGlSehTmLQbfnMmhNr FxWWrF2ZVHFJVcUwajgJukQp7w== X-Google-Smtp-Source: APiQypL33ENV5ZD5B9CcahUMM7NoJ1Avbm+N08a+Le+t/KelBY+oXG0I6QOA19BLb+xYF2a3EkYbrg== X-Received: by 2002:a7b:c30f:: with SMTP id k15mr3584892wmj.50.1585922332688; Fri, 03 Apr 2020 06:58:52 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id f141sm11783919wmf.3.2020.04.03.06.58.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 06:58:52 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Fri, 3 Apr 2020 15:57:59 +0200 Message-Id: <20200403135828.2542770-16-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> References: <20200403135828.2542770-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 15/44] drm/udl: Use demv_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 , Intel Graphics Development , 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. Signed-off-by: Daniel Vetter Cc: Dave Airlie Cc: Sean Paul Cc: Thomas Zimmermann Cc: Daniel Vetter Cc: Emil Velikov Cc: Sam Ravnborg Cc: Thomas Gleixner --- drivers/gpu/drm/udl/udl_drv.c | 36 +++++++++++------------------------ 1 file changed, 11 insertions(+), 25 deletions(-) diff --git a/drivers/gpu/drm/udl/udl_drv.c b/drivers/gpu/drm/udl/udl_drv.c index 1ce2d865c36d..4ba5149fdd57 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; } @@ -91,23 +84,17 @@ static int udl_usb_probe(struct usb_interface *interface, if (IS_ERR(udl)) return PTR_ERR(udl); + r = drm_fbdev_generic_setup(&udl->drm, 0); + if (r) + return r; + 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); - r = drm_fbdev_generic_setup(&udl->drm, 0); - if (r) - goto err_drm_dev_unregister; - return 0; - -err_drm_dev_unregister: - drm_dev_unregister(&udl->drm); -err_free: - drm_dev_put(&udl->drm); - return r; } static void udl_usb_disconnect(struct usb_interface *interface) @@ -117,7 +104,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); } /*