From patchwork Tue Jun 21 06:35:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 584061 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39868C433EF for ; Tue, 21 Jun 2022 06:35:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345333AbiFUGfi (ORCPT ); Tue, 21 Jun 2022 02:35:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235008AbiFUGfi (ORCPT ); Tue, 21 Jun 2022 02:35:38 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2DF115A07 for ; Mon, 20 Jun 2022 23:35:36 -0700 (PDT) Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o3XU6-0002Vh-12; Tue, 21 Jun 2022 08:35:34 +0200 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1o3XU2-001mg1-7e; Tue, 21 Jun 2022 08:35:31 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1o3XU2-0009Nd-Uv; Tue, 21 Jun 2022 08:35:30 +0200 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Doug Berger , Florian Fainelli , Linus Walleij , Bartosz Golaszewski Cc: Broadcom internal kernel review list , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@pengutronix.de Subject: [PATCH] gpio: brcmstb: Make .remove() obviously always return 0 Date: Tue, 21 Jun 2022 08:35:24 +0200 Message-Id: <20220621063524.146604-1-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1453; h=from:subject; bh=elYeY8lZw+FFM0NfPKFwTcZT0AbtnW5R5kafvn9u/Gg=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBisWappUPz26kDSXoAw/xCZQkwS1kAntSBW6+lwYCr 5kYMdiaJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYrFmqQAKCRDB/BR4rcrsCYewB/ sHSlcpcpRUbzQf+85ZwsBxRSV72r4AXaNQNiFoXBh6m5J83EAjaicVmKBh1puYFVjslKMVUq7UzeBC PW8FheSHOdB3IK7UvkTvoLb7YZxhAm9yPny0lm3WQaYpyemGuB1KV1e1m/msB4npHhj+CTmQTbleEy nfNOOY835Wp/kMn6CwVrvoafKmmWmywXZRO8WgLdLSbfCmCPQ+9Ody4mc7UEgNgOnH/yT8a/Yynkof QP55righgK3On42agR50gk1QVuMdjmEZDe5hF/R5evdsjav7m3B5yjXFWgJeJy+Kplzzkd1Z3YkWo/ SmuJkMirEePs3zjCQkX7KInlb5ANra X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-gpio@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org priv cannot be NULL because brcmstb_gpio_probe() calls platform_set_drvdata() with a non-NULL argument, so the check for !priv can be dropped. Also remove the variable ret that is only used to hide a bit that in the end zero is returned. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-König --- drivers/gpio/gpio-brcmstb.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) base-commit: f2906aa863381afb0015a9eb7fefad885d4e5a56 diff --git a/drivers/gpio/gpio-brcmstb.c b/drivers/gpio/gpio-brcmstb.c index 6b7439b44690..f620f0712134 100644 --- a/drivers/gpio/gpio-brcmstb.c +++ b/drivers/gpio/gpio-brcmstb.c @@ -385,12 +385,7 @@ static int brcmstb_gpio_remove(struct platform_device *pdev) { struct brcmstb_gpio_priv *priv = platform_get_drvdata(pdev); struct brcmstb_gpio_bank *bank; - int offset, ret = 0, virq; - - if (!priv) { - dev_err(&pdev->dev, "called %s without drvdata!\n", __func__); - return -EFAULT; - } + int offset, virq; if (priv->parent_irq > 0) irq_set_chained_handler_and_data(priv->parent_irq, NULL, NULL); @@ -411,7 +406,7 @@ static int brcmstb_gpio_remove(struct platform_device *pdev) list_for_each_entry(bank, &priv->bank_list, node) gpiochip_remove(&bank->gc); - return ret; + return 0; } static int brcmstb_gpio_of_xlate(struct gpio_chip *gc,