From patchwork Wed Feb 19 10:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11391113 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 58BA9930 for ; Wed, 19 Feb 2020 10:23:37 +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 36C7924680 for ; Wed, 19 Feb 2020 10:23:37 +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="iPqi5F1g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 36C7924680 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C6B676EB41; Wed, 19 Feb 2020 10:22:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4C6596EB8D for ; Wed, 19 Feb 2020 10:22:25 +0000 (UTC) Received: by mail-wm1-x341.google.com with SMTP id a5so5856528wmb.0 for ; Wed, 19 Feb 2020 02:22:25 -0800 (PST) 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=GyxR3rEO1FZs5BIiNni8jF96PqjDo3eJFecq4xcaCuE=; b=iPqi5F1gwreNxFZg7Tg0DZV9IAC5qD6OWLG2NF3WdbFzJg3IisP/Bwvc0rbynG2nY8 nDTAG0SyEinOItj8J4o8jlctCr7wJ/asmZyHluXy4If91Bu/ZtUrJqqW6aldZoJ2ZnDL r1Focf6bOQU/np1iRkhX1Uvfy4cHUYoizyUIY= 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=GyxR3rEO1FZs5BIiNni8jF96PqjDo3eJFecq4xcaCuE=; b=Xzb2tfUMBG7gJgbPKH7rNZZWeSEsFqYrI3xYnWUzozxPys9FHfUX48DV+nzS0CJmy2 nBcy+HHM3MXyiaMjpBaNBKzFU/nkXZOx16/wpv1GWGs7L17Zad/qsKdZxXW5wUpeq38X AvzuZxqhQi6/uRIRPMKkhtE+UcTwbikBBcdR2rHs261z3IFuXbP7Bp36dbF1EHhAQHZn 1y/yyeyAY2NV2/Tl/HmE76SlQzGPkXDdZhkv+B3KiJUTwXLL7kgShxjp1IEIb/I85w9V poz5DwWYBsgISUiR65+IL8qfMGfAuXa2nqHskNhDVqFY+azsXEXpjgmiTwT7iegBknn2 wX2Q== X-Gm-Message-State: APjAAAWevZHSBKaHX6AKWQY3wfYIvhS0LAIsYk3v68shRXzQWA5U2Jmw wdtqMPAJLXOXeKQQQIJR5OKmIK1n7l0= X-Google-Smtp-Source: APXvYqxzE36MMM/8ge3EyjCc2f+TulRZQVDMD8fiul9JQAeZrf9wv82MpPvH5c0QBv2r8tivNkQmcQ== X-Received: by 2002:a1c:720a:: with SMTP id n10mr9071290wmc.103.1582107743551; Wed, 19 Feb 2020 02:22:23 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s23sm2370339wra.15.2020.02.19.02.22.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2020 02:22:22 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 44/52] drm/gm12u320: Use devm_drm_dev_init Date: Wed, 19 Feb 2020 11:21:14 +0100 Message-Id: <20200219102122.1607365-45-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> References: <20200219102122.1607365-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics Development , Hans de Goede , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Only drops the drm_dev_put, but hey a few lines! Signed-off-by: Daniel Vetter Cc: Hans de Goede Cc: "Noralf Trønnes" --- drivers/gpu/drm/tiny/gm12u320.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/tiny/gm12u320.c b/drivers/gpu/drm/tiny/gm12u320.c index 5bd26fc6fafa..65dfb87ccb13 100644 --- a/drivers/gpu/drm/tiny/gm12u320.c +++ b/drivers/gpu/drm/tiny/gm12u320.c @@ -678,7 +678,7 @@ static int gm12u320_usb_probe(struct usb_interface *interface, init_waitqueue_head(&gm12u320->fb_update.waitq); dev = &gm12u320->dev; - ret = drm_dev_init(dev, &gm12u320_drm_driver, &interface->dev); + ret = devm_drm_dev_init(&interface->dev, dev, &gm12u320_drm_driver); if (ret) { kfree(gm12u320); return ret; @@ -688,7 +688,7 @@ static int gm12u320_usb_probe(struct usb_interface *interface, ret = drm_mode_config_init(dev); if (ret) - goto err_put; + return ret; dev->mode_config.min_width = GM12U320_USER_WIDTH; dev->mode_config.max_width = GM12U320_USER_WIDTH; @@ -698,15 +698,15 @@ static int gm12u320_usb_probe(struct usb_interface *interface, ret = gm12u320_usb_alloc(gm12u320); if (ret) - goto err_put; + return ret; ret = gm12u320_set_ecomode(gm12u320); if (ret) - goto err_put; + return ret; ret = gm12u320_conn_init(gm12u320); if (ret) - goto err_put; + return ret; ret = drm_simple_display_pipe_init(&gm12u320->dev, &gm12u320->pipe, @@ -716,22 +716,18 @@ static int gm12u320_usb_probe(struct usb_interface *interface, gm12u320_pipe_modifiers, &gm12u320->conn); if (ret) - goto err_put; + return ret; drm_mode_config_reset(dev); usb_set_intfdata(interface, dev); ret = drm_dev_register(dev, 0); if (ret) - goto err_put; + return ret; drm_fbdev_generic_setup(dev, 0); return 0; - -err_put: - drm_dev_put(dev); - return ret; } static void gm12u320_usb_disconnect(struct usb_interface *interface) @@ -741,7 +737,6 @@ static void gm12u320_usb_disconnect(struct usb_interface *interface) gm12u320_stop_fb_update(gm12u320); drm_dev_unplug(dev); - drm_dev_put(dev); } static __maybe_unused int gm12u320_suspend(struct usb_interface *interface,