backlight: sky81452: Privatize platform data

The only way the platform data for the SKY81452 ever gets populated
is through the device tree.

The MFD device is bothered with this for no reason at all. Just
allocate the platform data in the driver and be happy.

Cc: Gyungoh Yoo <jack.yoo@skyworksinc.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/sky81452.c b/drivers/mfd/sky81452.c
index 76eedfa..3ad35bf 100644 (file)
--- a/drivers/mfd/sky81452.c
+++ b/drivers/mfd/sky81452.c
@@ -47,8 +47,6 @@ static int sky81452_probe(struct i2c_client *client,
        memset(cells, 0, sizeof(cells));
        cells[0].name = "sky81452-backlight";
        cells[0].of_compatible = "skyworks,sky81452-backlight";
-       cells[0].platform_data = pdata->bl_pdata;
-       cells[0].pdata_size = sizeof(*pdata->bl_pdata);
        cells[1].name = "sky81452-regulator";
        cells[1].platform_data = pdata->regulator_init_data;
        cells[1].pdata_size = sizeof(*pdata->regulator_init_data);

diff --git a/drivers/video/backlight/sky81452-backlight.c b/drivers/video/backlight/sky81452-backlight.c
index 81d2c8f..83ccb3d 100644 (file)
--- a/drivers/video/backlight/sky81452-backlight.c
+++ b/drivers/video/backlight/sky81452-backlight.c
@@ -15,7 +15,6 @@
 #include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
-#include <linux/platform_data/sky81452-backlight.h>
 #include <linux/slab.h>
 
 /* registers */
@@ -41,6 +40,29 @@
 #define SKY81452_DEFAULT_NAME "lcd-backlight"
 #define SKY81452_MAX_BRIGHTNESS        (SKY81452_CS + 1)
 
+/**
+ * struct sky81452_platform_data
+ * @name:      backlight driver name.
+               If it is not defined, default name is lcd-backlight.
+ * @gpios_enable:GPIO descriptor which control EN pin
+ * @enable:    Enable mask for current sink channel 1, 2, 3, 4, 5 and 6.
+ * @ignore_pwm:        true if DPWMI should be ignored.
+ * @dpwm_mode: true is DPWM dimming mode, otherwise Analog dimming mode.
+ * @phase_shift:true is phase shift mode.
+ * @short_detecion_threshold:  It should be one of 4, 5, 6 and 7V.
+ * @boost_current_limit:       It should be one of 2300, 2750mA.
+ */
+struct sky81452_bl_platform_data {
+       const char *name;
+       struct gpio_desc *gpiod_enable;
+       unsigned int enable;
+       bool ignore_pwm;
+       bool dpwm_mode;
+       bool phase_shift;
+       unsigned int short_detection_threshold;
+       unsigned int boost_current_limit;
+};
+
 #define CTZ(b) __builtin_ctz(b)
 
 static int sky81452_bl_update_status(struct backlight_device *bd)
@@ -251,17 +273,15 @@ static int sky81452_bl_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct regmap *regmap = dev_get_drvdata(dev->parent);
-       struct sky81452_bl_platform_data *pdata = dev_get_platdata(dev);
+       struct sky81452_bl_platform_data *pdata;
        struct backlight_device *bd;
        struct backlight_properties props;
        const char *name;
        int ret;
 
-       if (!pdata) {
-               pdata = sky81452_bl_parse_dt(dev);
-               if (IS_ERR(pdata))
-                       return PTR_ERR(pdata);
-       }
+       pdata = sky81452_bl_parse_dt(dev);
+       if (IS_ERR(pdata))
+               return PTR_ERR(pdata);
 
        ret = sky81452_bl_init_device(regmap, pdata);
        if (ret < 0) {

diff --git a/include/linux/mfd/sky81452.h b/include/linux/mfd/sky81452.h
index d469aa4..b08570f 100644 (file)
--- a/include/linux/mfd/sky81452.h
+++ b/include/linux/mfd/sky81452.h
@@ -9,11 +9,9 @@
 #ifndef _SKY81452_H
 #define _SKY81452_H
 
-#include <linux/platform_data/sky81452-backlight.h>
 #include <linux/regulator/machine.h>
 
 struct sky81452_platform_data {
-       struct sky81452_bl_platform_data *bl_pdata;
        struct regulator_init_data *regulator_init_data;
 };
 

diff --git a/include/linux/platform_data/sky81452-backlight.h b/include/linux/platform_data/sky81452-backlight.h
deleted file mode 100644 (file)
index d6f4667..0000000
--- a/include/linux/platform_data/sky81452-backlight.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * sky81452.h  SKY81452 backlight driver
- *
- * Copyright 2014 Skyworks Solutions Inc.
- * Author : Gyungoh Yoo <jack.yoo@skyworksinc.com>
- */
-
-#ifndef _SKY81452_BACKLIGHT_H
-#define _SKY81452_BACKLIGHT_H
-
-#include <linux/gpio/consumer.h>
-
-/**
- * struct sky81452_platform_data
- * @name:      backlight driver name.
-               If it is not defined, default name is lcd-backlight.
- * @gpios_enable:GPIO descriptor which control EN pin
- * @enable:    Enable mask for current sink channel 1, 2, 3, 4, 5 and 6.
- * @ignore_pwm:        true if DPWMI should be ignored.
- * @dpwm_mode: true is DPWM dimming mode, otherwise Analog dimming mode.
- * @phase_shift:true is phase shift mode.
- * @short_detecion_threshold:  It should be one of 4, 5, 6 and 7V.
- * @boost_current_limit:       It should be one of 2300, 2750mA.
- */
-struct sky81452_bl_platform_data {
-       const char *name;
-       struct gpio_desc *gpiod_enable;
-       unsigned int enable;
-       bool ignore_pwm;
-       bool dpwm_mode;
-       bool phase_shift;
-       unsigned int short_detection_threshold;
-       unsigned int boost_current_limit;
-};
-
-#endif