[PATCH ]hmc5843: Convert to dev pm ops

[PATCH ]hmc5843: Convert to dev pm ops

[shubhrajyoti]

From: Shubhrajyoti Datta <shubhrajyoti@ti.com>


Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
---
 drivers/staging/iio/magnetometer/hmc5843.c |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 5168917..b1c26d8 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -583,20 +583,25 @@ static int hmc5843_remove(struct i2c_client *client)
 	kfree(i2c_get_clientdata(client));
 	return 0;
 }
-
-static int hmc5843_suspend(struct i2c_client *client, pm_message_t mesg)
+#ifdef CONFIG_PM
+static int hmc5843_suspend(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
 	hmc5843_configure(client, MODE_SLEEP);
 	return 0;
 }
 
-static int hmc5843_resume(struct i2c_client *client)
+static int hmc5843_resume(struct device *dev)
 {
+	struct i2c_client *client = to_i2c_client(dev);
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	hmc5843_configure(client, data->operating_mode);
 	return 0;
 }
-
+static SIMPLE_DEV_PM_OPS(hmc5843_pm, hmc5843_suspend, hmc5843_resume);
+#else
+#define hmc5843_pm NULL
+#endif
 static const struct i2c_device_id hmc5843_id[] = {
 	{ "hmc5843", 0 },
 	{ }
@@ -605,14 +610,15 @@ static const struct i2c_device_id hmc5843_id[] = {
 static struct i2c_driver hmc5843_driver = {
 	.driver = {
 		.name	= "hmc5843",
+#ifdef CONFIG_PM
+		.pm	= &hmc5843_pm,
+#endif
 	},
 	.id_table	= hmc5843_id,
 	.probe		= hmc5843_probe,
 	.remove		= hmc5843_remove,
 	.detect		= hmc5843_detect,
 	.address_list	= normal_i2c,
-	.suspend	= hmc5843_suspend,
-	.resume		= hmc5843_resume,
 };
 
 static int __init hmc5843_init(void)
-- 
1.7.1

[PATCH ] hmc5843: Trivial optimisation

[shubhrajyoti]

From: Shubhrajyoti Datta <shubhrajyoti@ti.com>

Free the memory that is used only at init


Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
---
 drivers/staging/iio/magnetometer/hmc5843.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index b1c26d8..9df66cd 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -529,7 +529,7 @@ static void hmc5843_init_client(struct i2c_client *client)
 	pr_info("HMC5843 initialized\n");
 }
 
-static int hmc5843_probe(struct i2c_client *client,
+static int __devinit hmc5843_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct hmc5843_data *data;
@@ -574,7 +574,7 @@ exit:
 	return err;
 }
 
-static int hmc5843_remove(struct i2c_client *client)
+static int __devexit hmc5843_remove(struct i2c_client *client)
 {
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	 /*  sleep mode to save power */
@@ -616,7 +616,7 @@ static struct i2c_driver hmc5843_driver = {
 	},
 	.id_table	= hmc5843_id,
 	.probe		= hmc5843_probe,
-	.remove		= hmc5843_remove,
+	.remove		=  __devexit_p(hmc5843_remove),
 	.detect		= hmc5843_detect,
 	.address_list	= normal_i2c,
 };
-- 
1.7.1

Re: [PATCH ] hmc5843: Trivial optimisation

[Jonathan Cameron]

On 01/18/11 06:59, shubhrajyoti@ti.com wrote:
> From: Shubhrajyoti Datta <shubhrajyoti@ti.com>
> 
> Free the memory that is used only at init

hmc5843_init_client is only called by probe.
Could also be marked as devinit for consistency
and possible tiny saving in memory...

Otherwise all fine with me, please forward to GregKH.
> 
> 
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
> ---
>  drivers/staging/iio/magnetometer/hmc5843.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index b1c26d8..9df66cd 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -529,7 +529,7 @@ static void hmc5843_init_client(struct i2c_client *client)
>  	pr_info("HMC5843 initialized\n");
>  }
>  
> -static int hmc5843_probe(struct i2c_client *client,
> +static int __devinit hmc5843_probe(struct i2c_client *client,
>  			 const struct i2c_device_id *id)
>  {
>  	struct hmc5843_data *data;
> @@ -574,7 +574,7 @@ exit:
>  	return err;
>  }
>  
> -static int hmc5843_remove(struct i2c_client *client)
> +static int __devexit hmc5843_remove(struct i2c_client *client)
>  {
>  	struct hmc5843_data *data = i2c_get_clientdata(client);
>  	 /*  sleep mode to save power */
> @@ -616,7 +616,7 @@ static struct i2c_driver hmc5843_driver = {
>  	},
>  	.id_table	= hmc5843_id,
>  	.probe		= hmc5843_probe,
> -	.remove		= hmc5843_remove,
> +	.remove		=  __devexit_p(hmc5843_remove),
>  	.detect		= hmc5843_detect,
>  	.address_list	= normal_i2c,
>  };

Re: [PATCH ]hmc5843: Convert to dev pm ops

[Jonathan Cameron]

On 01/18/11 06:59, shubhrajyoti@ti.com wrote:
> From: Shubhrajyoti Datta <shubhrajyoti@ti.com>
> 
> 
One quick query inline.
> Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
> ---
>  drivers/staging/iio/magnetometer/hmc5843.c |   18 ++++++++++++------
>  1 files changed, 12 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index 5168917..b1c26d8 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -583,20 +583,25 @@ static int hmc5843_remove(struct i2c_client *client)
>  	kfree(i2c_get_clientdata(client));
>  	return 0;
>  }
> -
> -static int hmc5843_suspend(struct i2c_client *client, pm_message_t mesg)
> +#ifdef CONFIG_PM
> +static int hmc5843_suspend(struct device *dev)
>  {
> +	struct i2c_client *client = to_i2c_client(dev);
>  	hmc5843_configure(client, MODE_SLEEP);
>  	return 0;
>  }
>  
> -static int hmc5843_resume(struct i2c_client *client)
> +static int hmc5843_resume(struct device *dev)
>  {
> +	struct i2c_client *client = to_i2c_client(dev);
>  	struct hmc5843_data *data = i2c_get_clientdata(client);
>  	hmc5843_configure(client, data->operating_mode);
>  	return 0;
>  }
> -
> +static SIMPLE_DEV_PM_OPS(hmc5843_pm, hmc5843_suspend, hmc5843_resume);
> +#else
> +#define hmc5843_pm NULL
Is this needed given at a quick glance, it doesn't look like hmc5843_pm
is used anywhere if CONFIG_PM isn't defined?  (it's protected below as
well)
> +#endif
>  static const struct i2c_device_id hmc5843_id[] = {
>  	{ "hmc5843", 0 },
>  	{ }
> @@ -605,14 +610,15 @@ static const struct i2c_device_id hmc5843_id[] = {
>  static struct i2c_driver hmc5843_driver = {
>  	.driver = {
>  		.name	= "hmc5843",
> +#ifdef CONFIG_PM
> +		.pm	= &hmc5843_pm,
> +#endif
>  	},
>  	.id_table	= hmc5843_id,
>  	.probe		= hmc5843_probe,
>  	.remove		= hmc5843_remove,
>  	.detect		= hmc5843_detect,
>  	.address_list	= normal_i2c,
> -	.suspend	= hmc5843_suspend,
> -	.resume		= hmc5843_resume,
>  };
>  
>  static int __init hmc5843_init(void)

[PATCH] hmc5843: Trivial optimisation

[shubhrajyoti]

From: Shubhrajyoti D <a0393217@india.ti.com>

Free the memory that is used only at init

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
Acked-by: "Jonathan Cameron <jic23@cam.ac.uk>"
---
 drivers/staging/iio/magnetometer/hmc5843.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 4f4c98a..a93c0fb 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -516,7 +516,7 @@ static int hmc5843_detect(struct i2c_client *client,
 }
 
 /* Called when we have found a new HMC5843. */
-static void hmc5843_init_client(struct i2c_client *client)
+static void __devinit hmc5843_init_client(struct i2c_client *client)
 {
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	hmc5843_set_meas_conf(client, data->meas_conf);
@@ -527,7 +527,7 @@ static void hmc5843_init_client(struct i2c_client *client)
 	pr_info("HMC5843 initialized\n");
 }
 
-static int hmc5843_probe(struct i2c_client *client,
+static int __devinit hmc5843_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct hmc5843_data *data;
@@ -572,7 +572,7 @@ exit:
 	return err;
 }
 
-static int hmc5843_remove(struct i2c_client *client)
+static int __devexit hmc5843_remove(struct i2c_client *client)
 {
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	 /*  sleep mode to save power */
@@ -614,7 +614,7 @@ static struct i2c_driver hmc5843_driver = {
 	},
 	.id_table	= hmc5843_id,
 	.probe		= hmc5843_probe,
-	.remove		= hmc5843_remove,
+	.remove		=  __devexit_p(hmc5843_remove),
 	.detect		= hmc5843_detect,
 	.address_list	= normal_i2c,
 };
-- 
1.7.1

Re: [PATCH] hmc5843: Trivial optimisation

[Shubhrajyoti]

On Wednesday 19 January 2011 03:32 PM, shubhrajyoti@ti.com wrote:
> From: Shubhrajyoti D<a0393217@india.ti.com>.
Some how the email addresses got messed up. Please ignore this patch.
> Free the memory that is used only at init
>
> Signed-off-by: Shubhrajyoti Datta<shubhrajyoti@ti.com>
> Acked-by: "Jonathan Cameron<jic23@cam.ac.uk>"
> ---
>   drivers/staging/iio/magnetometer/hmc5843.c |    8 ++++----
>   1 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
> index 4f4c98a..a93c0fb 100644
> --- a/drivers/staging/iio/magnetometer/hmc5843.c
> +++ b/drivers/staging/iio/magnetometer/hmc5843.c
> @@ -516,7 +516,7 @@ static int hmc5843_detect(struct i2c_client *client,
>   }
>
>   /* Called when we have found a new HMC5843. */
> -static void hmc5843_init_client(struct i2c_client *client)
> +static void __devinit hmc5843_init_client(struct i2c_client *client)
>   {
>   	struct hmc5843_data *data = i2c_get_clientdata(client);
>   	hmc5843_set_meas_conf(client, data->meas_conf);
> @@ -527,7 +527,7 @@ static void hmc5843_init_client(struct i2c_client *client)
>   	pr_info("HMC5843 initialized\n");
>   }
>
> -static int hmc5843_probe(struct i2c_client *client,
> +static int __devinit hmc5843_probe(struct i2c_client *client,
>   			 const struct i2c_device_id *id)
>   {
>   	struct hmc5843_data *data;
> @@ -572,7 +572,7 @@ exit:
>   	return err;
>   }
>
> -static int hmc5843_remove(struct i2c_client *client)
> +static int __devexit hmc5843_remove(struct i2c_client *client)
>   {
>   	struct hmc5843_data *data = i2c_get_clientdata(client);
>   	 /*  sleep mode to save power */
> @@ -614,7 +614,7 @@ static struct i2c_driver hmc5843_driver = {
>   	},
>   	.id_table	= hmc5843_id,
>   	.probe		= hmc5843_probe,
> -	.remove		= hmc5843_remove,
> +	.remove		=  __devexit_p(hmc5843_remove),
>   	.detect		= hmc5843_detect,
>   	.address_list	= normal_i2c,
>   };

[PATCH] hmc5843: Trivial optimisation

[shubhrajyoti]

From: Shubhrajyoti Datta <shubhrajyoti@ti.com>

Free the memory that is used only at init

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti@ti.com>
Acked-by: "Jonathan Cameron <jic23@cam.ac.uk>"
---
 drivers/staging/iio/magnetometer/hmc5843.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index 4f4c98a..a93c0fb 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -516,7 +516,7 @@ static int hmc5843_detect(struct i2c_client *client,
 }
 
 /* Called when we have found a new HMC5843. */
-static void hmc5843_init_client(struct i2c_client *client)
+static void __devinit hmc5843_init_client(struct i2c_client *client)
 {
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	hmc5843_set_meas_conf(client, data->meas_conf);
@@ -527,7 +527,7 @@ static void hmc5843_init_client(struct i2c_client *client)
 	pr_info("HMC5843 initialized\n");
 }
 
-static int hmc5843_probe(struct i2c_client *client,
+static int __devinit hmc5843_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct hmc5843_data *data;
@@ -572,7 +572,7 @@ exit:
 	return err;
 }
 
-static int hmc5843_remove(struct i2c_client *client)
+static int __devexit hmc5843_remove(struct i2c_client *client)
 {
 	struct hmc5843_data *data = i2c_get_clientdata(client);
 	 /*  sleep mode to save power */
@@ -614,7 +614,7 @@ static struct i2c_driver hmc5843_driver = {
 	},
 	.id_table	= hmc5843_id,
 	.probe		= hmc5843_probe,
-	.remove		= hmc5843_remove,
+	.remove		=  __devexit_p(hmc5843_remove),
 	.detect		= hmc5843_detect,
 	.address_list	= normal_i2c,
 };
-- 
1.7.1