2013-03-14 10:30:39

by Sachin Kamat

Subject: [PATCH 1/1] sbs-battery: Use of_match_ptr() macro

This eliminates having an #ifdef returning NULL for the case
when OF is disabled.

Signed-off-by: Sachin Kamat <[email protected]>
---
drivers/power/sbs-battery.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 3960f0b..3922f06 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -27,6 +27,7 @@
#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/gpio.h>
+#include <linux/of.h>

#include <linux/power/sbs-battery.h>

@@ -667,7 +668,6 @@ of_out:
return pdata;
}
#else
-#define sbs_dt_ids NULL
static struct sbs_platform_data *sbs_of_populate_pdata(
struct i2c_client *client)
{
@@ -859,7 +859,7 @@ static struct i2c_driver sbs_battery_driver = {
.id_table = sbs_id,
.driver = {
.name = "sbs-battery",
- .of_match_table = sbs_dt_ids,
+ .of_match_table = of_match_ptr(sbs_dt_ids),
},
};
module_i2c_driver(sbs_battery_driver);
--
1.7.4.1

2013-04-01 05:49:03

by Anton Vorontsov

Subject: Re: [PATCH 1/1] sbs-battery: Use of_match_ptr() macro

On Mon, Apr 01, 2013 at 09:02:28AM +0530, Sachin Kamat wrote:
[...]
> > - .of_match_table = sbs_dt_ids,
> > + .of_match_table = of_match_ptr(sbs_dt_ids),
> > },
> > };
> > module_i2c_driver(sbs_battery_driver);
> > --
> > 1.7.4.1
>
> ping...

Applied, thanks!

Anton