extcon: gpio: Move platform data into state container

This moves the platform data settings from the platform data
struct and into the state container, saving some unnecessary
references and simplifying things a bit.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[cw00.choi: Add FIXME comment of extcon_id]
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 5f88f36..b544997 100644 (file)
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -29,7 +29,13 @@
 #include <linux/workqueue.h>
 
 /**
- * struct gpio_extcon_pdata - A simple GPIO-controlled extcon device.
+ * struct gpio_extcon_data - A simple GPIO-controlled extcon device state container.
+ * @edev:              Extcon device.
+ * @irq:               Interrupt line for the external connector.
+ * @work:              Work fired by the interrupt.
+ * @debounce_jiffies:  Number of jiffies to wait for the GPIO to stabilize, from the debounce
+ *                     value.
+ * @id_gpiod:          GPIO descriptor for this external connector.
  * @extcon_id:         The unique id of specific external connector.
  * @gpio:              Corresponding GPIO.
  * @gpio_active_low:   Boolean describing whether gpio active state is 1 or 0
@@ -40,23 +46,18 @@
  * @check_on_resume:   Boolean describing whether to check the state of gpio
  *                     while resuming from sleep.
  */
-struct gpio_extcon_pdata {
-       unsigned int extcon_id;
-       unsigned gpio;
-       bool gpio_active_low;
-       unsigned long debounce;
-       unsigned long irq_flags;
-       bool check_on_resume;
-};
-
 struct gpio_extcon_data {
        struct extcon_dev *edev;
        int irq;
        struct delayed_work work;
        unsigned long debounce_jiffies;
-
        struct gpio_desc *id_gpiod;
-       struct gpio_extcon_pdata *pdata;
+       unsigned int extcon_id;
+       unsigned gpio;
+       bool gpio_active_low;
+       unsigned long debounce;
+       unsigned long irq_flags;
+       bool check_on_resume;
 };
 
 static void gpio_extcon_work(struct work_struct *work)
@@ -67,10 +68,10 @@ static void gpio_extcon_work(struct work_struct *work)
                             work);
 
        state = gpiod_get_value_cansleep(data->id_gpiod);
-       if (data->pdata->gpio_active_low)
+       if (data->gpio_active_low)
                state = !state;
 
-       extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);
+       extcon_set_state_sync(data->edev, data->extcon_id, state);
 }
 
 static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
@@ -84,24 +85,23 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
 
 static int gpio_extcon_init(struct device *dev, struct gpio_extcon_data *data)
 {
-       struct gpio_extcon_pdata *pdata = data->pdata;
        int ret;
 
-       ret = devm_gpio_request_one(dev, pdata->gpio, GPIOF_DIR_IN,
+       ret = devm_gpio_request_one(dev, data->gpio, GPIOF_DIR_IN,
                                dev_name(dev));
        if (ret < 0)
                return ret;
 
-       data->id_gpiod = gpio_to_desc(pdata->gpio);
+       data->id_gpiod = gpio_to_desc(data->gpio);
        if (!data->id_gpiod)
                return -EINVAL;
 
-       if (pdata->debounce) {
+       if (data->debounce) {
                ret = gpiod_set_debounce(data->id_gpiod,
-                                       pdata->debounce * 1000);
+                                        data->debounce * 1000);
                if (ret < 0)
                        data->debounce_jiffies =
-                               msecs_to_jiffies(pdata->debounce);
+                               msecs_to_jiffies(data->debounce);
        }
 
        data->irq = gpiod_to_irq(data->id_gpiod);
@@ -113,20 +113,23 @@ static int gpio_extcon_init(struct device *dev, struct gpio_extcon_data *data)
 
 static int gpio_extcon_probe(struct platform_device *pdev)
 {
-       struct gpio_extcon_pdata *pdata = dev_get_platdata(&pdev->dev);
        struct gpio_extcon_data *data;
        int ret;
 
-       if (!pdata)
-               return -EBUSY;
-       if (!pdata->irq_flags || pdata->extcon_id > EXTCON_NONE)
-               return -EINVAL;
-
        data = devm_kzalloc(&pdev->dev, sizeof(struct gpio_extcon_data),
                                   GFP_KERNEL);
        if (!data)
                return -ENOMEM;
-       data->pdata = pdata;
+
+       /*
+        * FIXME: extcon_id represents the unique identifier of external
+        * connectors such as EXTCON_USB, EXTCON_DISP_HDMI and so on. extcon_id
+        * is necessary to register the extcon device. But, it's not yet
+        * developed to get the extcon id from device-tree or others.
+        * On later, it have to be solved.
+        */
+       if (!data->irq_flags || data->extcon_id > EXTCON_NONE)
+               return -EINVAL;
 
        /* Initialize the gpio */
        ret = gpio_extcon_init(&pdev->dev, data);
@@ -134,7 +137,7 @@ static int gpio_extcon_probe(struct platform_device *pdev)
                return ret;
 
        /* Allocate the memory of extcon devie and register extcon device */
-       data->edev = devm_extcon_dev_allocate(&pdev->dev, &pdata->extcon_id);
+       data->edev = devm_extcon_dev_allocate(&pdev->dev, &data->extcon_id);
        if (IS_ERR(data->edev)) {
                dev_err(&pdev->dev, "failed to allocate extcon device\n");
                return -ENOMEM;
@@ -151,7 +154,7 @@ static int gpio_extcon_probe(struct platform_device *pdev)
         * is attached or detached.
         */
        ret = devm_request_any_context_irq(&pdev->dev, data->irq,
-                                       gpio_irq_handler, pdata->irq_flags,
+                                       gpio_irq_handler, data->irq_flags,
                                        pdev->name, data);
        if (ret < 0)
                return ret;
@@ -178,7 +181,7 @@ static int gpio_extcon_resume(struct device *dev)
        struct gpio_extcon_data *data;
 
        data = dev_get_drvdata(dev);
-       if (data->pdata->check_on_resume)
+       if (data->check_on_resume)
                queue_delayed_work(system_power_efficient_wq,
                        &data->work, data->debounce_jiffies);