From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
Cc: "Wolfram Sang" <wsa@kernel.org>,
"Uwe Kleine-König" <uwe@kleine-koenig.org>,
"Sekhar Nori" <nsekhar@ti.com>,
"Bartosz Golaszewski" <brgl@bgdev.pl>,
"Russell King" <linux@armlinux.org.uk>,
"Scott Wood" <oss@buserror.net>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Benjamin Herrenschmidt" <benh@kernel.crashing.org>,
"Paul Mackerras" <paulus@samba.org>,
"Robin van der Gracht" <robin@protonic.nl>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Corey Minyard" <minyard@acm.org>,
"Peter Huewe" <peterhuewe@gmx.de>,
"Jarkko Sakkinen" <jarkko@kernel.org>,
"Jason Gunthorpe" <jgg@ziepe.ca>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
"Alexandre Belloni" <alexandre.belloni@bootlin.com>,
"Claudiu Beznea" <claudiu.beznea@microchip.com>,
"Max Filippov" <jcmvbkbc@gmail.com>,
"Michael Turquette" <mturquette@baylibre.com>,
"Stephen Boyd" <sboyd@kernel.org>,
"Luca Ceresoli" <luca@lucaceresoli.net>,
"Tudor Ambarus" <tudor.ambarus@microchip.com>,
"Herbert Xu" <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
"MyungJoo Ham" <myungjoo.ham@samsung.com>,
"Chanwoo Choi" <cw00.choi@samsung.com>,
"Michael Hennerich" <michael.hennerich@analog.com>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Andrzej Hajda" <andrzej.hajda@intel.com>,
"Neil Armstrong" <narmstrong@baylibre.com>,
"Robert Foss" <robert.foss@linaro.org>,
"Laurent Pinchart" <Laurent.pinchart@ideasonboard.com>,
"Jonas Karlman" <jonas@kwiboo.se>,
"Jernej Skrabec" <jernej.skrabec@gmail.com>,
"David Airlie" <airlied@linux.ie>,
"Daniel Vetter" <daniel@ffwll.ch>,
"Benson Leung" <bleung@chromium.org>,
"Guenter Roeck" <groeck@chromium.org>,
"Phong LE" <ple@baylibre.com>,
"Adrien Grassein" <adrien.grassein@gmail.com>,
"Peter Senna Tschudin" <peter.senna@gmail.com>,
"Martin Donnelly" <martin.donnelly@ge.com>,
"Martyn Welch" <martyn.welch@collabora.co.uk>,
"Douglas Anderson" <dianders@chromium.org>,
"Stefan Mavrodiev" <stefan@olimex.com>,
"Thierry Reding" <thierry.reding@gmail.com>,
"Sam Ravnborg" <sam@ravnborg.org>,
"Florian Fainelli" <f.fainelli@gmail.com>,
Broad@vger.kernel.org
Subject: Re: [PATCH 6/6] i2c: Make remove callback return void
Date: Wed, 29 Jun 2022 10:40:23 +0300 [thread overview]
Message-ID: <YrwB5xPKZmHlXzrC@kuha.fi.intel.com> (raw)
In-Reply-To: <20220628140313.74984-7-u.kleine-koenig@pengutronix.de>
On Tue, Jun 28, 2022 at 04:03:12PM +0200, Uwe Kleine-König wrote:
> diff --git a/drivers/usb/typec/hd3ss3220.c b/drivers/usb/typec/hd3ss3220.c
> index cd47c3597e19..2a58185fb14c 100644
> --- a/drivers/usb/typec/hd3ss3220.c
> +++ b/drivers/usb/typec/hd3ss3220.c
> @@ -245,14 +245,12 @@ static int hd3ss3220_probe(struct i2c_client *client,
> return ret;
> }
>
> -static int hd3ss3220_remove(struct i2c_client *client)
> +static void hd3ss3220_remove(struct i2c_client *client)
> {
> struct hd3ss3220 *hd3ss3220 = i2c_get_clientdata(client);
>
> typec_unregister_port(hd3ss3220->port);
> usb_role_switch_put(hd3ss3220->role_sw);
> -
> - return 0;
> }
>
> static const struct of_device_id dev_ids[] = {
> diff --git a/drivers/usb/typec/mux/fsa4480.c b/drivers/usb/typec/mux/fsa4480.c
> index 6184f5367190..d6495e533e58 100644
> --- a/drivers/usb/typec/mux/fsa4480.c
> +++ b/drivers/usb/typec/mux/fsa4480.c
> @@ -181,14 +181,12 @@ static int fsa4480_probe(struct i2c_client *client)
> return 0;
> }
>
> -static int fsa4480_remove(struct i2c_client *client)
> +static void fsa4480_remove(struct i2c_client *client)
> {
> struct fsa4480 *fsa = i2c_get_clientdata(client);
>
> typec_mux_unregister(fsa->mux);
> typec_switch_unregister(fsa->sw);
> -
> - return 0;
> }
>
> static const struct i2c_device_id fsa4480_table[] = {
> diff --git a/drivers/usb/typec/mux/pi3usb30532.c b/drivers/usb/typec/mux/pi3usb30532.c
> index 6ce9f282594e..1cd388b55c30 100644
> --- a/drivers/usb/typec/mux/pi3usb30532.c
> +++ b/drivers/usb/typec/mux/pi3usb30532.c
> @@ -160,13 +160,12 @@ static int pi3usb30532_probe(struct i2c_client *client)
> return 0;
> }
>
> -static int pi3usb30532_remove(struct i2c_client *client)
> +static void pi3usb30532_remove(struct i2c_client *client)
> {
> struct pi3usb30532 *pi = i2c_get_clientdata(client);
>
> typec_mux_unregister(pi->mux);
> typec_switch_unregister(pi->sw);
> - return 0;
> }
>
> static const struct i2c_device_id pi3usb30532_table[] = {
> diff --git a/drivers/usb/typec/rt1719.c b/drivers/usb/typec/rt1719.c
> index f1b698edd7eb..ea8b700b0ceb 100644
> --- a/drivers/usb/typec/rt1719.c
> +++ b/drivers/usb/typec/rt1719.c
> @@ -930,14 +930,12 @@ static int rt1719_probe(struct i2c_client *i2c)
> return ret;
> }
>
> -static int rt1719_remove(struct i2c_client *i2c)
> +static void rt1719_remove(struct i2c_client *i2c)
> {
> struct rt1719_data *data = i2c_get_clientdata(i2c);
>
> typec_unregister_port(data->port);
> usb_role_switch_put(data->role_sw);
> -
> - return 0;
> }
>
> static const struct of_device_id __maybe_unused rt1719_device_table[] = {
> diff --git a/drivers/usb/typec/stusb160x.c b/drivers/usb/typec/stusb160x.c
> index e7745d1c2a5c..8638f1d39896 100644
> --- a/drivers/usb/typec/stusb160x.c
> +++ b/drivers/usb/typec/stusb160x.c
> @@ -801,7 +801,7 @@ static int stusb160x_probe(struct i2c_client *client)
> return ret;
> }
>
> -static int stusb160x_remove(struct i2c_client *client)
> +static void stusb160x_remove(struct i2c_client *client)
> {
> struct stusb160x *chip = i2c_get_clientdata(client);
>
> @@ -823,8 +823,6 @@ static int stusb160x_remove(struct i2c_client *client)
>
> if (chip->main_supply)
> regulator_disable(chip->main_supply);
> -
> - return 0;
> }
>
> static int __maybe_unused stusb160x_suspend(struct device *dev)
> diff --git a/drivers/usb/typec/tcpm/fusb302.c b/drivers/usb/typec/tcpm/fusb302.c
> index 96c55eaf3f80..5e9348f28d50 100644
> --- a/drivers/usb/typec/tcpm/fusb302.c
> +++ b/drivers/usb/typec/tcpm/fusb302.c
> @@ -1771,7 +1771,7 @@ static int fusb302_probe(struct i2c_client *client,
> return ret;
> }
>
> -static int fusb302_remove(struct i2c_client *client)
> +static void fusb302_remove(struct i2c_client *client)
> {
> struct fusb302_chip *chip = i2c_get_clientdata(client);
>
> @@ -1783,8 +1783,6 @@ static int fusb302_remove(struct i2c_client *client)
> fwnode_handle_put(chip->tcpc_dev.fwnode);
> destroy_workqueue(chip->wq);
> fusb302_debugfs_exit(chip);
> -
> - return 0;
> }
>
> static int fusb302_pm_suspend(struct device *dev)
> diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c
> index f33e08eb7670..c48fca60bb06 100644
> --- a/drivers/usb/typec/tcpm/tcpci.c
> +++ b/drivers/usb/typec/tcpm/tcpci.c
> @@ -869,7 +869,7 @@ static int tcpci_probe(struct i2c_client *client,
> return 0;
> }
>
> -static int tcpci_remove(struct i2c_client *client)
> +static void tcpci_remove(struct i2c_client *client)
> {
> struct tcpci_chip *chip = i2c_get_clientdata(client);
> int err;
> @@ -880,8 +880,6 @@ static int tcpci_remove(struct i2c_client *client)
> dev_warn(&client->dev, "Failed to disable irqs (%pe)\n", ERR_PTR(err));
>
> tcpci_unregister_port(chip->tcpci);
> -
> - return 0;
> }
>
> static const struct i2c_device_id tcpci_id[] = {
> diff --git a/drivers/usb/typec/tcpm/tcpci_maxim.c b/drivers/usb/typec/tcpm/tcpci_maxim.c
> index df2505570f07..a11be5754128 100644
> --- a/drivers/usb/typec/tcpm/tcpci_maxim.c
> +++ b/drivers/usb/typec/tcpm/tcpci_maxim.c
> @@ -493,14 +493,12 @@ static int max_tcpci_probe(struct i2c_client *client, const struct i2c_device_id
> return ret;
> }
>
> -static int max_tcpci_remove(struct i2c_client *client)
> +static void max_tcpci_remove(struct i2c_client *client)
> {
> struct max_tcpci_chip *chip = i2c_get_clientdata(client);
>
> if (!IS_ERR_OR_NULL(chip->tcpci))
> tcpci_unregister_port(chip->tcpci);
> -
> - return 0;
> }
>
> static const struct i2c_device_id max_tcpci_id[] = {
> diff --git a/drivers/usb/typec/tcpm/tcpci_rt1711h.c b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> index b56a0880a044..9ad4924b4ba7 100644
> --- a/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> +++ b/drivers/usb/typec/tcpm/tcpci_rt1711h.c
> @@ -263,12 +263,11 @@ static int rt1711h_probe(struct i2c_client *client,
> return 0;
> }
>
> -static int rt1711h_remove(struct i2c_client *client)
> +static void rt1711h_remove(struct i2c_client *client)
> {
> struct rt1711h_chip *chip = i2c_get_clientdata(client);
>
> tcpci_unregister_port(chip->tcpci);
> - return 0;
> }
>
> static const struct i2c_device_id rt1711h_id[] = {
> diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
> index dfbba5ae9487..b637e8b378b3 100644
> --- a/drivers/usb/typec/tipd/core.c
> +++ b/drivers/usb/typec/tipd/core.c
> @@ -857,15 +857,13 @@ static int tps6598x_probe(struct i2c_client *client)
> return ret;
> }
>
> -static int tps6598x_remove(struct i2c_client *client)
> +static void tps6598x_remove(struct i2c_client *client)
> {
> struct tps6598x *tps = i2c_get_clientdata(client);
>
> tps6598x_disconnect(tps, 0);
> typec_unregister_port(tps->port);
> usb_role_switch_put(tps->role_sw);
> -
> - return 0;
> }
>
> static const struct of_device_id tps6598x_of_match[] = {
> diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c
> index 6db7c8ddd51c..920b7e743f56 100644
> --- a/drivers/usb/typec/ucsi/ucsi_ccg.c
> +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c
> @@ -1398,7 +1398,7 @@ static int ucsi_ccg_probe(struct i2c_client *client,
> return status;
> }
>
> -static int ucsi_ccg_remove(struct i2c_client *client)
> +static void ucsi_ccg_remove(struct i2c_client *client)
> {
> struct ucsi_ccg *uc = i2c_get_clientdata(client);
>
> @@ -1408,8 +1408,6 @@ static int ucsi_ccg_remove(struct i2c_client *client)
> ucsi_unregister(uc->ucsi);
> ucsi_destroy(uc->ucsi);
> free_irq(uc->irq, uc);
> -
> - return 0;
> }
>
> static const struct i2c_device_id ucsi_ccg_device_id[] = {
> diff --git a/drivers/usb/typec/wusb3801.c b/drivers/usb/typec/wusb3801.c
> index e63509f8b01e..3cc7a15ecbd3 100644
> --- a/drivers/usb/typec/wusb3801.c
> +++ b/drivers/usb/typec/wusb3801.c
> @@ -399,7 +399,7 @@ static int wusb3801_probe(struct i2c_client *client)
> return ret;
> }
>
> -static int wusb3801_remove(struct i2c_client *client)
> +static void wusb3801_remove(struct i2c_client *client)
> {
> struct wusb3801 *wusb3801 = i2c_get_clientdata(client);
>
> @@ -411,8 +411,6 @@ static int wusb3801_remove(struct i2c_client *client)
>
> if (wusb3801->vbus_on)
> regulator_disable(wusb3801->vbus_supply);
> -
> - return 0;
> }
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
--
heikki
next prev parent reply other threads:[~2022-06-29 7:41 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220628140313.74984-1-u.kleine-koenig@pengutronix.de>
[not found] ` <20220628140313.74984-7-u.kleine-koenig@pengutronix.de>
[not found] ` <60cc6796236f23c028a9ae76dbe00d1917df82a5.camel@codeconstruct.com.au>
2022-06-29 7:23 ` [PATCH 6/6] i2c: Make remove callback return void Uwe Kleine-König
2022-06-29 7:37 ` Javier Martinez Canillas
2022-06-29 7:55 ` Christophe Leroy
2022-06-29 8:09 ` Javier Martinez Canillas
2022-06-29 7:40 ` Heikki Krogerus [this message]
2022-06-29 10:40 ` Andy Shevchenko
[not found] ` <CAPAsAGwP4Mw_CJfsi7oapABdTBwO1HfiQux6X4UahspU74VjtQ@mail.gmail.com>
2022-06-29 13:35 ` Uwe Kleine-König
2022-06-29 14:25 ` Maximilian Luz
2022-06-29 21:20 ` Luca Ceresoli
2022-07-05 10:08 ` Jean Delvare
2022-07-05 10:36 ` Uwe Kleine-König
2022-07-06 9:13 ` Vladimir Oltean
2022-07-06 9:31 ` Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YrwB5xPKZmHlXzrC@kuha.fi.intel.com \
--to=heikki.krogerus@linux.intel.com \
--cc=Broad@vger.kernel.org \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=adrien.grassein@gmail.com \
--cc=airlied@linux.ie \
--cc=alexandre.belloni@bootlin.com \
--cc=andrzej.hajda@intel.com \
--cc=benh@kernel.crashing.org \
--cc=bleung@chromium.org \
--cc=brgl@bgdev.pl \
--cc=claudiu.beznea@microchip.com \
--cc=cw00.choi@samsung.com \
--cc=daniel@ffwll.ch \
--cc=davem@davemloft.net \
--cc=dianders@chromium.org \
--cc=f.fainelli@gmail.com \
--cc=groeck@chromium.org \
--cc=herbert@gondor.apana.org.au \
--cc=jarkko@kernel.org \
--cc=jcmvbkbc@gmail.com \
--cc=jernej.skrabec@gmail.com \
--cc=jgg@ziepe.ca \
--cc=jonas@kwiboo.se \
--cc=linus.walleij@linaro.org \
--cc=linux@armlinux.org.uk \
--cc=luca@lucaceresoli.net \
--cc=martin.donnelly@ge.com \
--cc=martyn.welch@collabora.co.uk \
--cc=michael.hennerich@analog.com \
--cc=minyard@acm.org \
--cc=mpe@ellerman.id.au \
--cc=mturquette@baylibre.com \
--cc=myungjoo.ham@samsung.com \
--cc=narmstrong@baylibre.com \
--cc=nicolas.ferre@microchip.com \
--cc=nsekhar@ti.com \
--cc=ojeda@kernel.org \
--cc=oss@buserror.net \
--cc=paulus@samba.org \
--cc=peter.senna@gmail.com \
--cc=peterhuewe@gmx.de \
--cc=ple@baylibre.com \
--cc=robert.foss@linaro.org \
--cc=robin@protonic.nl \
--cc=sam@ravnborg.org \
--cc=sboyd@kernel.org \
--cc=stefan@olimex.com \
--cc=thierry.reding@gmail.com \
--cc=tudor.ambarus@microchip.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=uwe@kleine-koenig.org \
--cc=wsa@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).