From patchwork Tue Jul 18 16:54:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 122150 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1895588vqt; Tue, 18 Jul 2023 10:19:31 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQftNrRXzmP1DYxyTd6xuAQNYd6YwMsj7QT6RFd+a7cs2/EFD4MFiTynoFgIJDDrK2j3so X-Received: by 2002:a05:6a21:3290:b0:12c:3973:800d with SMTP id yt16-20020a056a21329000b0012c3973800dmr17867192pzb.6.1689700771593; Tue, 18 Jul 2023 10:19:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689700771; cv=none; d=google.com; s=arc-20160816; b=kqSM4y4BcUZy1s0Ux5CjxRExUF0gcGJgGiqNwALHNGdfRihWYKeEVch4AbTKY15XHW Lux2HUYRx+hdiNxEOCJy32d+TeQHcCsm/OXyQsqZBm999PRZJQ4I1y00dxfCq/JuP09Y oeiugaRG0sHmV92yWdg3TkcjLizuwbZgq2dD5ijgjZdBsX+IZmR8SeVcMIISMwY8Jiu/ JXPD5lrOkRFx6lskYkZTjiaeuLc8WLHqCyxSgHaxx3QI4ltEkf2pWEpjSTtOMUyChXJu Nx9Z2jzvLOCQVYyvzk1gE1u/25LVWN7pX9ie0B6IfnZpJbTtEhqkzppSrftPCJXaeCQy OVTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=btzpp39GOfocH+3no9OQwVCWMJgIS3csZoyJhJ4HooA=; fh=Ople2ijcDVdvBJwvAg2RvyZp0qNZK7It46SN0LxlrVk=; b=jYRKFPiJ1oYDQHQktYuy8H29Dv6+jRXvlYfCeYD2I3rqnHtjddiYBxfS+reBUjY98x a+pfu0HHfg3JS427snnQBzuGJ3r8KPq5FZV+IaTaLtavw6vnyfuYVQYeRUDFBaZJ9nfg dSO9rTpgsJHDQEzSO/G4sGGZoNeYQAvKIRXOD+EltfyNFIVE9rK04uZ4aTQ2xc9XiueF 3U93sAlynv7aRjNVlL7bh2FnyRjJt6bdW7Mp617LGSkjsavwYnqnDaT6bRFtz/1xa1hQ eG84/y/Teaio9NFdvExdWMOizzIph0GWiMenv7gitf51faLGhmfVynULewi/hymhjBsE 17Vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 12-20020a630f4c000000b0055c7d9edbc5si1862973pgp.174.2023.07.18.10.19.18; Tue, 18 Jul 2023 10:19:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233312AbjGRQzo (ORCPT + 99 others); Tue, 18 Jul 2023 12:55:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232573AbjGRQzA (ORCPT ); Tue, 18 Jul 2023 12:55:00 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 272D219A8 for ; Tue, 18 Jul 2023 09:54:54 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:5803:2d6d:5bbc:e252]) by albert.telenet-ops.be with bizsmtp id Ngur2A00R0ucMBo06gurSd; Tue, 18 Jul 2023 18:54:52 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qLnyD-001nYX-BX; Tue, 18 Jul 2023 18:54:51 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qLnyN-000gcT-Ch; Tue, 18 Jul 2023 18:54:51 +0200 From: Geert Uytterhoeven To: Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , Thomas Zimmermann , Magnus Damm Cc: linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Laurent Pinchart Subject: [PATCH v2 17/41] drm: renesas: shmobile: Convert to use devm_request_irq() Date: Tue, 18 Jul 2023 18:54:22 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771779676303802267 X-GMAIL-MSGID: 1771779676303802267 Convert to managed IRQ handling, to simplify cleanup. Signed-off-by: Geert Uytterhoeven Reviewed-by: Laurent Pinchart --- v2: - Add Reviewed-by. --- drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c index 91daab80b0ede058..381e184abf552c4c 100644 --- a/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c @@ -196,7 +196,6 @@ static int shmob_drm_remove(struct platform_device *pdev) drm_dev_unregister(ddev); drm_kms_helper_poll_fini(ddev); - free_irq(sdev->irq, ddev); drm_dev_put(ddev); return 0; @@ -279,8 +278,8 @@ static int shmob_drm_probe(struct platform_device *pdev) goto err_modeset_cleanup; sdev->irq = ret; - ret = request_irq(sdev->irq, shmob_drm_irq, 0, ddev->driver->name, - ddev); + ret = devm_request_irq(&pdev->dev, sdev->irq, shmob_drm_irq, 0, + ddev->driver->name, ddev); if (ret < 0) { dev_err(&pdev->dev, "failed to install IRQ handler\n"); goto err_modeset_cleanup; @@ -292,14 +291,12 @@ static int shmob_drm_probe(struct platform_device *pdev) */ ret = drm_dev_register(ddev, 0); if (ret < 0) - goto err_irq_uninstall; + goto err_modeset_cleanup; drm_fbdev_generic_setup(ddev, 16); return 0; -err_irq_uninstall: - free_irq(sdev->irq, ddev); err_modeset_cleanup: drm_kms_helper_poll_fini(ddev); err_free_drm_dev: