* [PATCH] i2c/muxes: (pca954x) Remove __devinit and __devexit from probe and remove functions
@ 2010-10-20 15:43 Guenter Roeck
[not found] ` <1287589413-1003-1-git-send-email-guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Guenter Roeck @ 2010-10-20 15:43 UTC (permalink / raw)
To: Jean Delvare
Cc: Ben Dooks, Rodolfo Giometti, linux-i2c-u79uwXL29TY76Z2rM5mHXA,
Guenter Roeck
Signed-off-by: Guenter Roeck <guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
---
drivers/i2c/muxes/pca954x.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
index 6f9accf..54e1ce7 100644
--- a/drivers/i2c/muxes/pca954x.c
+++ b/drivers/i2c/muxes/pca954x.c
@@ -181,8 +181,8 @@ static int pca954x_deselect_mux(struct i2c_adapter *adap,
/*
* I2C init/probing/exit functions
*/
-static int __devinit pca954x_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int pca954x_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
{
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
struct pca954x_platform_data *pdata = client->dev.platform_data;
@@ -255,7 +255,7 @@ err:
return ret;
}
-static int __devexit pca954x_remove(struct i2c_client *client)
+static int pca954x_remove(struct i2c_client *client)
{
struct pca954x *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type];
@@ -279,7 +279,7 @@ static struct i2c_driver pca954x_driver = {
.owner = THIS_MODULE,
},
.probe = pca954x_probe,
- .remove = __devexit_p(pca954x_remove),
+ .remove = pca954x_remove,
.id_table = pca954x_id,
};
--
1.7.3.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] i2c/muxes: (pca954x) Remove __devinit and __devexit from probe and remove functions
[not found] ` <1287589413-1003-1-git-send-email-guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
@ 2010-10-21 15:36 ` Jean Delvare
[not found] ` <20101021173613.66df5fb7-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Jean Delvare @ 2010-10-21 15:36 UTC (permalink / raw)
To: Guenter Roeck
Cc: Ben Dooks, Rodolfo Giometti, linux-i2c-u79uwXL29TY76Z2rM5mHXA
On Wed, 20 Oct 2010 08:43:33 -0700, Guenter Roeck wrote:
> Signed-off-by: Guenter Roeck <guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
Next time I would appreciate an explanation why the change is needed.
I've added it myself this time...
> ---
> drivers/i2c/muxes/pca954x.c | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/i2c/muxes/pca954x.c b/drivers/i2c/muxes/pca954x.c
> index 6f9accf..54e1ce7 100644
> --- a/drivers/i2c/muxes/pca954x.c
> +++ b/drivers/i2c/muxes/pca954x.c
> @@ -181,8 +181,8 @@ static int pca954x_deselect_mux(struct i2c_adapter *adap,
> /*
> * I2C init/probing/exit functions
> */
> -static int __devinit pca954x_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +static int pca954x_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> {
> struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
> struct pca954x_platform_data *pdata = client->dev.platform_data;
> @@ -255,7 +255,7 @@ err:
> return ret;
> }
>
> -static int __devexit pca954x_remove(struct i2c_client *client)
> +static int pca954x_remove(struct i2c_client *client)
> {
> struct pca954x *data = i2c_get_clientdata(client);
> const struct chip_desc *chip = &chips[data->type];
> @@ -279,7 +279,7 @@ static struct i2c_driver pca954x_driver = {
> .owner = THIS_MODULE,
> },
> .probe = pca954x_probe,
> - .remove = __devexit_p(pca954x_remove),
> + .remove = pca954x_remove,
> .id_table = pca954x_id,
> };
>
Applied, thanks.
--
Jean Delvare
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] i2c/muxes: (pca954x) Remove __devinit and __devexit from probe and remove functions
[not found] ` <20101021173613.66df5fb7-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
@ 2010-10-21 16:04 ` Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2010-10-21 16:04 UTC (permalink / raw)
To: Jean Delvare
Cc: Ben Dooks, Rodolfo Giometti,
linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
On Thu, Oct 21, 2010 at 11:36:13AM -0400, Jean Delvare wrote:
> On Wed, 20 Oct 2010 08:43:33 -0700, Guenter Roeck wrote:
> > Signed-off-by: Guenter Roeck <guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
>
> Next time I would appreciate an explanation why the change is needed.
> I've added it myself this time...
>
Ok.
Guenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-10-21 16:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-20 15:43 [PATCH] i2c/muxes: (pca954x) Remove __devinit and __devexit from probe and remove functions Guenter Roeck
[not found] ` <1287589413-1003-1-git-send-email-guenter.roeck-IzeFyvvaP7pWk0Htik3J/w@public.gmane.org>
2010-10-21 15:36 ` Jean Delvare
[not found] ` <20101021173613.66df5fb7-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org>
2010-10-21 16:04 ` Guenter Roeck
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox