On Saturday, December 06, 2014 3:44 AM, Sean Paul wrote:
quoted hunk
Now that we've removed all traces of pdata, remove the CONFIG_OF ifdef
from lp855x and instead make the driver depend on OF.
Signed-off-by: Sean Paul <redacted>
---
drivers/video/backlight/Kconfig | 2 +-
drivers/video/backlight/lp855x_bl.c | 7 -------
2 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/drivers/video/backlight/Kconfig b/drivers/video/backlight/Kconfig
index 8d03924..113c8b3 100644
--- a/drivers/video/backlight/Kconfig
+++ b/drivers/video/backlight/Kconfig
@@ -384,7 +384,7 @@ config BACKLIGHT_LM3639
config BACKLIGHT_LP855X
tristate "Backlight driver for TI LP855X"
- depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM
+ depends on BACKLIGHT_CLASS_DEVICE && I2C && PWM && OF
help
This supports TI LP8550, LP8551, LP8552, LP8553, LP8555, LP8556 and
LP8557 backlight driver.
diff --git a/drivers/video/backlight/lp855x_bl.c b/drivers/video/backlight/lp855x_bl.c
index 8b81d8e..3d3b8cf 100644
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -379,7 +379,6 @@ static const struct attribute_group lp855x_attr_group = {
.attrs = lp855x_attributes,
};
-#ifdef CONFIG_OF
static int lp855x_parse_dt(struct lp855x *lp)
{
struct device *dev = lp->dev;@@ -425,12 +424,6 @@ static int lp855x_parse_dt(struct lp855x *lp)
return 0;
}
-#else
8 more quoted lines
One more thin, in this case, of_match_ptr() is redundant;
thus, of_match_ptr() can be also removed as follows.
--- a/drivers/video/backlight/lp855x_bl.c
+++ b/drivers/video/backlight/lp855x_bl.c
@@ -487,7 +487,7 @@ MODULE_DEVICE_TABLE(i2c, lp855x_ids);
static struct i2c_driver lp855x_driver = { .driver = {
.name = "lp855x",
- .of_match_table = of_match_ptr(lp855x_dt_ids),
+ .of_match_table = lp855x_dt_ids,
},
.probe = lp855x_probe,
.remove = lp855x_remove,
Best regards,
Jingoo Han
--
2.2.0.rc0.207.ga3a616c