aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2013-03-14 06:19:46 -0400
committerAnton Vorontsov <anton@enomsg.org>2013-03-31 23:37:26 -0400
commit075ed03ce6c2cd148b4606619e775c6e46aa89e1 (patch)
treecdf6347a0a649f4f52b813df507eda80ec55f65b /drivers/power
parent18bc4e79fdff1baa82d57ef364590fcdcc0a2612 (diff)
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 <sachin.kamat@linaro.org> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/sbs-battery.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/power/sbs-battery.c b/drivers/power/sbs-battery.c
index 3960f0b2afe9..3922f06120c8 100644
--- a/drivers/power/sbs-battery.c
+++ b/drivers/power/sbs-battery.c
@@ -27,6 +27,7 @@
27#include <linux/slab.h> 27#include <linux/slab.h>
28#include <linux/interrupt.h> 28#include <linux/interrupt.h>
29#include <linux/gpio.h> 29#include <linux/gpio.h>
30#include <linux/of.h>
30 31
31#include <linux/power/sbs-battery.h> 32#include <linux/power/sbs-battery.h>
32 33
@@ -667,7 +668,6 @@ of_out:
667 return pdata; 668 return pdata;
668} 669}
669#else 670#else
670#define sbs_dt_ids NULL
671static struct sbs_platform_data *sbs_of_populate_pdata( 671static struct sbs_platform_data *sbs_of_populate_pdata(
672 struct i2c_client *client) 672 struct i2c_client *client)
673{ 673{
@@ -859,7 +859,7 @@ static struct i2c_driver sbs_battery_driver = {
859 .id_table = sbs_id, 859 .id_table = sbs_id,
860 .driver = { 860 .driver = {
861 .name = "sbs-battery", 861 .name = "sbs-battery",
862 .of_match_table = sbs_dt_ids, 862 .of_match_table = of_match_ptr(sbs_dt_ids),
863 }, 863 },
864}; 864};
865module_i2c_driver(sbs_battery_driver); 865module_i2c_driver(sbs_battery_driver);