hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Sachin Kamat 2013-03-14 15:49:46 +05:30 committed by Anton Vorontsov
parent 18bc4e79fd
commit 075ed03ce6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/power/sbs-battery.c
View File

@ -27,6 +27,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of.h>
#include <linux/power/sbs-battery.h> #include <linux/power/sbs-battery.h>
@ -667,7 +668,6 @@ of_out:
return pdata; return pdata;
} }
#else #else
#define sbs_dt_ids NULL
static struct sbs_platform_data *sbs_of_populate_pdata( static struct sbs_platform_data *sbs_of_populate_pdata(
struct i2c_client *client) struct i2c_client *client)
{ {
@ -859,7 +859,7 @@ static struct i2c_driver sbs_battery_driver = {
.id_table = sbs_id, .id_table = sbs_id,
.driver = { .driver = {
.name = "sbs-battery", .name = "sbs-battery",
.of_match_table = sbs_dt_ids, .of_match_table = of_match_ptr(sbs_dt_ids),
}, },
}; };
module_i2c_driver(sbs_battery_driver); module_i2c_driver(sbs_battery_driver);