From patchwork Mon Mar 23 14:49:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11453303 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 64396174A for ; Mon, 23 Mar 2020 14:52:08 +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 424EB20753 for ; Mon, 23 Mar 2020 14:52:08 +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="D4OAlQvI" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 424EB20753 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 F088D6E262; Mon, 23 Mar 2020 14:51:07 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 10CEA6E247 for ; Mon, 23 Mar 2020 14:50:59 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id 65so739356wrl.1 for ; Mon, 23 Mar 2020 07:50:58 -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=2h9nVkR6GZVSqp0Uq5z09nALfzbd4PTui374h6bOKxQ=; b=D4OAlQvIOJLCr5x2ccySSYxgiVH8cMqxeCqbKlA83ccoc41HRhPYbRd2FIrOlTf/4L pLqaJsrRz1xTDrHmZG3VlUuWRkEmPExl57CUrF/Slt7AVUkhRY0j13l7iQB9iKRtCsPh veXo0vpQdQyBxkVI+rq8IgfVG3UT7baE/D0Xs= 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=2h9nVkR6GZVSqp0Uq5z09nALfzbd4PTui374h6bOKxQ=; b=N9K5U37Bku2SDN/qJIktyhnJcspxJMQ5288FrkgQ5dpmGl/GWV0cnneXZFegn8vvlQ meXETJsZNvaWxCr6+frRbU5MUwCeVP10EFHfC8t1x9+YupuCKRH1//0qBvuXXhQouMVW W6lIbWkRtGETKQcxz+QolpJIC4nqFH32MG+kuFiKoUcON1anguPtn1Mr7Akv2ZIZKuqR LXD8X6jV/8B7xLXApS7b+0CIw9PX4MnYwZK2/Osl/rdpZ6cNd9spx6x142foF5dOx/6l j4sKAGVqOX2tx0sF495er62enO+Zxj91ossUL5KfzPrZzfo1oCNU+4QLpUviqcCOog52 WUsw== X-Gm-Message-State: ANhLgQ2hb16SicW9CXEnuGFDtizNujrbol73pMhTSKscgFv4EWuwtfJX 4U5n5fX3psYlgogVt8Jbv2XjFglETHkyUw== X-Google-Smtp-Source: ADFU+vv3xYkvag/3iy+5tXiymVHAGy7IrB71E97MIOWv/6UEREKNJ4HXUrQNA4hPjkcVGExQTwEBkw== X-Received: by 2002:a5d:644c:: with SMTP id d12mr31053888wrw.54.1584975057386; Mon, 23 Mar 2020 07:50:57 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id s22sm20376522wmc.16.2020.03.23.07.50.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Mar 2020 07:50:56 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 43/51] drm/gm12u320: Use devm_drm_dev_init Date: Mon, 23 Mar 2020 15:49:42 +0100 Message-Id: <20200323144950.3018436-44-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200323144950.3018436-1-daniel.vetter@ffwll.ch> References: <20200323144950.3018436-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 , Daniel Vetter , Intel Graphics Development , Hans de Goede Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Only drops the drm_dev_put, but hey a few lines! Reviewed-by: Hans de Goede 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 3349f3c2a765..9fb579fc3412 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 = drmm_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,