From nobody Fri May 1 11:13:47 2026 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 3C330C433F5 for ; Mon, 30 May 2022 19:25:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237243AbiE3TZK (ORCPT ); Mon, 30 May 2022 15:25:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbiE3TZH (ORCPT ); Mon, 30 May 2022 15:25:07 -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 726F62AF0 for ; Mon, 30 May 2022 12:25:05 -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 1nvl0h-0002B3-KC; Mon, 30 May 2022 21:25:03 +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 1nvl0h-005Vcg-R8; Mon, 30 May 2022 21:25:02 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nvl0f-00D9rr-R5; Mon, 30 May 2022 21:25:01 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Lee Jones Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH 1/4] mfd: asic3: Make asic3_gpio_remove() return void Date: Mon, 30 May 2022 21:24:27 +0200 Message-Id: <20220530192430.2108217-2-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> References: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1674; h=from:subject; bh=2vih2xfjYYCBqWvzNoDgwxq/6pFitQWwOd7o14Q+mkA=; b=owGbwMvMwMV48I9IxdpTbzgZT6slMSRNlTxn983uV3lqGHtgWaEn+9YV5amHHs8p11eZbrxQKerW geUdnYzGLAyMXAyyYoosdUVaYhMk1vy3K1nCDTOIlQlkCgMXpwBMJDuT/X9+2a6NmVee9ntee8Dxwe EItwavjp5uSttr8/n+ksLtOecdtJ24RbRkXWawh+6V//zleIBjZ0BghIXXc0kJCZstBkf1ZD/9tvgm E6+4J/2f74m8v6Itnz23sDPo+j/q2Z5blcr9NbS2Sf3hjR7tdoYrt28FsvGdlHaZ4aO3Webz7M1ltc unZ1blJoZKLdvHccZR0ien6nCfYhI753vHI2ZsB6adNmvYzM99bfHF5JlH02Q9V287Y6zC8kzbING7 445N3Kpb2lejIsyMUw/OeZ04UTm0XE8x8Ovzo+KJktqzH+67IPklhm1JcxP7Est1ff+PpBnPXXGX9W D5vR/qrlwVnZO1yoSd58ma3m0HAA== X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Up to now asic3_gpio_remove() returns zero unconditionally. This makes it easier to see in the caller that there is no error to handle. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-K=C3=B6nig --- Side note: asic3_mfd_probe() which is called by asic3_probe() could return an error, but this isn't handled. --- drivers/mfd/asic3.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 56338f9dbd0b..4fb7e35eb5ed 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -596,12 +596,11 @@ static __init int asic3_gpio_probe(struct platform_de= vice *pdev, return gpiochip_add_data(&asic->gpio, asic); } =20 -static int asic3_gpio_remove(struct platform_device *pdev) +static void asic3_gpio_remove(struct platform_device *pdev) { struct asic3 *asic =3D platform_get_drvdata(pdev); =20 gpiochip_remove(&asic->gpio); - return 0; } =20 static void asic3_clk_enable(struct asic3 *asic, struct asic3_clk *clk) @@ -1030,7 +1029,6 @@ static int __init asic3_probe(struct platform_device = *pdev) =20 static int asic3_remove(struct platform_device *pdev) { - int ret; struct asic3 *asic =3D platform_get_drvdata(pdev); =20 asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT), @@ -1038,9 +1036,8 @@ static int asic3_remove(struct platform_device *pdev) =20 asic3_mfd_remove(pdev); =20 - ret =3D asic3_gpio_remove(pdev); - if (ret < 0) - return ret; + asic3_gpio_remove(pdev); + asic3_irq_remove(pdev); =20 asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), 0); --=20 2.36.1 From nobody Fri May 1 11:13:47 2026 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 EA7E1C433EF for ; Mon, 30 May 2022 19:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241206AbiE3TZO (ORCPT ); Mon, 30 May 2022 15:25:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233280AbiE3TZI (ORCPT ); Mon, 30 May 2022 15:25:08 -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 32DCE27CF7 for ; Mon, 30 May 2022 12:25:07 -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 1nvl0i-0002B6-1a; Mon, 30 May 2022 21:25:04 +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 1nvl0i-005Vcr-MP; Mon, 30 May 2022 21:25:03 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nvl0g-00D9rw-0T; Mon, 30 May 2022 21:25:02 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Lee Jones , Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/4] mfd: t7l66xb: Drop platform disable callback Date: Mon, 30 May 2022 21:24:28 +0200 Message-Id: <20220530192430.2108217-3-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> References: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1967; h=from:subject; bh=KLS92mnV4uioYj/VXMUTsR46ZBmBliG9+/eL2gP9ruw=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBilRnXL6djC0HTLnCmADRIVxAOSHSiiZ6SBlf3VJfo CiWeBBOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpUZ1wAKCRDB/BR4rcrsCfDsB/ wLoUOUI8uudFz8mpFN+y9dH9kL85D3x7wUOkeky3+K8KTiTJwNHoLA1nNDxYXG89rJgLEoWguFDTY2 yQglOdlnrvK3StcEEBHEDlV7K53macBN73DyFCMGpaw+lnmxnMNqazQJNFbl7L+0ekAAFFwPcpmyrH An3CdQZVd8RedcFYi897xtwhD1sS6ZhcciNAwyAt4cAWMV6xOdyTFVC47nGyviJm/hSytgRTxSxVtD /rLSKuvsNT/KWctVvj5kDYwpyrVf7xJBUdOkXWhzfK+4tx1ljZwxqZvcdo//g4NWKVHTZk1td4kxfu Xfcd3oSP68pNo5tHQXMVzJuFxWOz6W X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org None of the in-tree instantiations of struct t7l66xb_platform_data provides a disable callback. So better don't dereference this function pointer unconditionally. As there is no user, drop it completely instead of calling it conditional. This is a preparation for making platform remove callbacks return void. Fixes: 1f192015ca5b ("mfd: driver for the T7L66XB TMIO SoC") Signed-off-by: Uwe Kleine-K=C3=B6nig --- Technically this fixes the first commit introducing a struct t7l66xb_platform_data without a disable callback, but ... --- drivers/mfd/t7l66xb.c | 6 +----- include/linux/mfd/t7l66xb.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 5369c67e3280..663ffd4b8570 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c @@ -397,11 +397,8 @@ static int t7l66xb_probe(struct platform_device *dev) =20 static int t7l66xb_remove(struct platform_device *dev) { - struct t7l66xb_platform_data *pdata =3D dev_get_platdata(&dev->dev); struct t7l66xb *t7l66xb =3D platform_get_drvdata(dev); - int ret; =20 - ret =3D pdata->disable(dev); clk_disable_unprepare(t7l66xb->clk48m); clk_put(t7l66xb->clk48m); clk_disable_unprepare(t7l66xb->clk32k); @@ -412,8 +409,7 @@ static int t7l66xb_remove(struct platform_device *dev) mfd_remove_devices(&dev->dev); kfree(t7l66xb); =20 - return ret; - + return 0; } =20 static struct platform_driver t7l66xb_platform_driver =3D { diff --git a/include/linux/mfd/t7l66xb.h b/include/linux/mfd/t7l66xb.h index 69632c1b07bd..ae3e7a5c5219 100644 --- a/include/linux/mfd/t7l66xb.h +++ b/include/linux/mfd/t7l66xb.h @@ -12,7 +12,6 @@ =20 struct t7l66xb_platform_data { int (*enable)(struct platform_device *dev); - int (*disable)(struct platform_device *dev); int (*suspend)(struct platform_device *dev); int (*resume)(struct platform_device *dev); =20 --=20 2.36.1 From nobody Fri May 1 11:13:47 2026 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 216B7C433EF for ; Mon, 30 May 2022 19:25:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242305AbiE3TZX (ORCPT ); Mon, 30 May 2022 15:25:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236246AbiE3TZI (ORCPT ); Mon, 30 May 2022 15:25:08 -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 42F2128E2F for ; Mon, 30 May 2022 12:25:07 -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 1nvl0h-0002B5-TP; Mon, 30 May 2022 21:25:03 +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 1nvl0i-005Vco-I4; Mon, 30 May 2022 21:25:03 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nvl0g-00D9rz-6q; Mon, 30 May 2022 21:25:02 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Lee Jones , Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/4] mfd: tc6387xb: Drop disable callback that is never called Date: Mon, 30 May 2022 21:24:29 +0200 Message-Id: <20220530192430.2108217-4-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> References: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1262; h=from:subject; bh=Xo82Zuy1oWrg9pa7SyqpFYQImVx3xnjtayADlWISXvI=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBilRnaA70RpnGj5h60z0rwBwnCgtq/CvJUQD39bKTK 3hSUgcOJATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpUZ2gAKCRDB/BR4rcrsCak0B/ 9pfaZ9CtRwVuS+vbTh+M9/0auq4zmf/TThyx9MXZZ7NmEukkJgdpPWgiSWlT6A8kJuVMXxahvUmQrk vctYRw8PzzMXoqzziOos/bqAPYgg6kyaWy97EXUrhjCXK65SLHx2cT9G84gh5VDV7G+pZpyLU5pmS+ 9OosuHxduqWgFNV2lPdTAbJOYMQTdhqHU1FMM3m7e00LT6HYonOvbmM2DWoR4cEuf8it1cQdlqNN94 26gt38s7Oklp+Mt4IlzpYCIWX92oKeFGuijukU63rs5qRnWyOCbpsT+SiVclqOZMGYi1pAKrUAO0AI AC9PLbReEkONyA90bm4ZfZYGF/USN6 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver never calls the disable callback, so drop the member from the platform struct and all callbacks from the actual platform datas. Signed-off-by: Uwe Kleine-K=C3=B6nig --- arch/arm/mach-pxa/eseries.c | 1 - include/linux/mfd/tc6387xb.h | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index f37c44b6139d..cb7bf6294e12 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c @@ -138,7 +138,6 @@ static void __init __maybe_unused eseries_register_clks= (void) =20 static struct tc6387xb_platform_data e330_tc6387xb_info =3D { .enable =3D &eseries_tmio_enable, - .disable =3D &eseries_tmio_disable, .suspend =3D &eseries_tmio_suspend, .resume =3D &eseries_tmio_resume, }; diff --git a/include/linux/mfd/tc6387xb.h b/include/linux/mfd/tc6387xb.h index b4888209494a..aacf1dcc86b9 100644 --- a/include/linux/mfd/tc6387xb.h +++ b/include/linux/mfd/tc6387xb.h @@ -12,7 +12,6 @@ =20 struct tc6387xb_platform_data { int (*enable)(struct platform_device *dev); - int (*disable)(struct platform_device *dev); int (*suspend)(struct platform_device *dev); int (*resume)(struct platform_device *dev); }; --=20 2.36.1 From nobody Fri May 1 11:13:47 2026 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 49FFAC433EF for ; Mon, 30 May 2022 19:25:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242979AbiE3TZ0 (ORCPT ); Mon, 30 May 2022 15:25:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236624AbiE3TZI (ORCPT ); Mon, 30 May 2022 15:25:08 -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 9A1902AF0 for ; Mon, 30 May 2022 12:25:07 -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 1nvl0i-0002B8-4P; Mon, 30 May 2022 21:25:04 +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 1nvl0i-005Vcu-Of; Mon, 30 May 2022 21:25:03 +0200 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1nvl0g-00D9s2-DX; Mon, 30 May 2022 21:25:02 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Lee Jones , Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org Subject: [PATCH 4/4] mfd: tc6393xb: Make disable callback return void Date: Mon, 30 May 2022 21:24:30 +0200 Message-Id: <20220530192430.2108217-5-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> References: <20220530192430.2108217-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=2970; h=from:subject; bh=f/Kbd6S1TkQ8db5BjGINURGo9N9WQ2gxpBhEfpvdF2A=; b=owEBbQGS/pANAwAKAcH8FHityuwJAcsmYgBilRnj8N5AiR1ecmr6JmPbpwgdH//GPbgtCPqHxS0E 1m0q2+2JATMEAAEKAB0WIQR+cioWkBis/z50pAvB/BR4rcrsCQUCYpUZ4wAKCRDB/BR4rcrsCfm2B/ 9QvlkDId2uuzHUmtJZOesyOeUguhTboadbdEaMSkTQq3o0LNcPfE4tZhFKvavlYewNqgGBdO4ybNfm P04ccvy+RWljfOFnJs9szpLsLghOE6JNkj8ao0FyqVMToL6qpu9mVD51pu/gOVNk6X+dZuoCbl/iaB ZtJ5b/MDKqxx/AOBDawaUq/5w/lbsINhZbIcl7Lm3R/nXUH2LLD8ALZU5DxsD2tuaVELkybV7wjPXg pFovyBRqja0C660rBDde8QqJRBSDl+3rBqJLoRAJQMmZS6M30c3Z8TU5H7DeHKak5aaQiCaABz/4yh qqh5VwYqm90YhlV42C85xpA5l75C/Q X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All implementations return 0, so simplify accordingly. This is a preparation for making platform remove callbacks return void. Signed-off-by: Uwe Kleine-K=C3=B6nig --- arch/arm/mach-pxa/eseries.c | 3 +-- arch/arm/mach-pxa/tosa.c | 4 +--- drivers/mfd/tc6393xb.c | 5 ++--- include/linux/mfd/tc6393xb.h | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-pxa/eseries.c b/arch/arm/mach-pxa/eseries.c index cb7bf6294e12..c0b496300e3f 100644 --- a/arch/arm/mach-pxa/eseries.c +++ b/arch/arm/mach-pxa/eseries.c @@ -85,11 +85,10 @@ int eseries_tmio_enable(struct platform_device *dev) return 0; } =20 -int eseries_tmio_disable(struct platform_device *dev) +void eseries_tmio_disable(struct platform_device *dev) { gpio_set_value(GPIO_ESERIES_TMIO_SUSPEND, 0); gpio_set_value(GPIO_ESERIES_TMIO_PCLR, 0); - return 0; } =20 int eseries_tmio_suspend(struct platform_device *dev) diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 431709725d02..8d97c0d74e8f 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c @@ -662,13 +662,11 @@ static int tosa_tc6393xb_enable(struct platform_devic= e *dev) return rc; } =20 -static int tosa_tc6393xb_disable(struct platform_device *dev) +static void tosa_tc6393xb_disable(struct platform_device *dev) { gpio_free(TOSA_GPIO_TC6393XB_L3V_ON); gpio_free(TOSA_GPIO_TC6393XB_SUSPEND); gpio_free(TOSA_GPIO_TC6393XB_REST_IN); - - return 0; } =20 static int tosa_tc6393xb_resume(struct platform_device *dev) diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 3d5b14c60e20..7de210f143de 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c @@ -734,7 +734,6 @@ static int tc6393xb_remove(struct platform_device *dev) { struct tc6393xb_platform_data *tcpd =3D dev_get_platdata(&dev->dev); struct tc6393xb *tc6393xb =3D platform_get_drvdata(dev); - int ret; =20 mfd_remove_devices(&dev->dev); =20 @@ -746,14 +745,14 @@ static int tc6393xb_remove(struct platform_device *de= v) if (tc6393xb->gpio.base !=3D -1) gpiochip_remove(&tc6393xb->gpio); =20 - ret =3D tcpd->disable(dev); + tcpd->disable(dev); clk_disable_unprepare(tc6393xb->clk); iounmap(tc6393xb->scr); release_resource(&tc6393xb->rscr); clk_put(tc6393xb->clk); kfree(tc6393xb); =20 - return ret; + return 0; } =20 #ifdef CONFIG_PM diff --git a/include/linux/mfd/tc6393xb.h b/include/linux/mfd/tc6393xb.h index fcc8e74f0e8d..602b391ed13a 100644 --- a/include/linux/mfd/tc6393xb.h +++ b/include/linux/mfd/tc6393xb.h @@ -22,7 +22,7 @@ struct tc6393xb_platform_data { u16 scr_gper; /* GP Enable */ =20 int (*enable)(struct platform_device *dev); - int (*disable)(struct platform_device *dev); + void (*disable)(struct platform_device *dev); int (*suspend)(struct platform_device *dev); int (*resume)(struct platform_device *dev); =20 --=20 2.36.1