Re: [PATCH 09/14] Regulators: max8660 - annotate probe and removemethods

[Liam Girdwood]

On Tue, 2010-02-23 at 23:38 -0800, Dmitry Torokhov wrote:
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxx>
> ---
> 
>  drivers/regulator/max8660.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
> index acc2fb7..f12f1bb 100644
> --- a/drivers/regulator/max8660.c
> +++ b/drivers/regulator/max8660.c
> @@ -345,8 +345,8 @@ static struct regulator_desc max8660_reg[] = {
>  	},
>  };
>  
> -static int max8660_probe(struct i2c_client *client,
> -			      const struct i2c_device_id *i2c_id)
> +static int __devinit max8660_probe(struct i2c_client *client,
> +				   const struct i2c_device_id *i2c_id)
>  {
>  	struct regulator_dev **rdev;
>  	struct max8660_platform_data *pdata = client->dev.platform_data;
> @@ -354,7 +354,7 @@ static int max8660_probe(struct i2c_client *client,
>  	int boot_on, i, id, ret = -EINVAL;
>  
>  	if (pdata->num_subdevs > MAX8660_V_END) {
> -		dev_err(&client->dev, "Too much regulators found!\n");
> +		dev_err(&client->dev, "Too many regulators found!\n");
>  		goto out;
>  	}
>  
> @@ -462,7 +462,7 @@ out:
>  	return ret;
>  }
>  
> -static int max8660_remove(struct i2c_client *client)
> +static int __devexit max8660_remove(struct i2c_client *client)
>  {
>  	struct regulator_dev **rdev = i2c_get_clientdata(client);
>  	int i;
> @@ -485,9 +485,10 @@ MODULE_DEVICE_TABLE(i2c, max8660_id);
>  
>  static struct i2c_driver max8660_driver = {
>  	.probe = max8660_probe,
> -	.remove = max8660_remove,
> +	.remove = __devexit_p(max8660_remove),
>  	.driver		= {
>  		.name	= "max8660",
> +		.owner	= THIS_MODULE,
>  	},
>  	.id_table	= max8660_id,
>  };
> 

Applied.

Thanks

Liam

-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/