Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block

[platform/kernel/linux-rpi.git] / drivers / extcon / extcon-gpio.c

diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index 355459a..57c24fa 100644 (file)
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -65,22 +65,6 @@ static irqreturn_t gpio_irq_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static ssize_t extcon_gpio_print_state(struct extcon_dev *edev, char *buf)
-{
-       struct device *dev = edev->dev.parent;
-       struct gpio_extcon_data *extcon_data = dev_get_drvdata(dev);
-       const char *state;
-
-       if (extcon_get_state(edev))
-               state = extcon_data->state_on;
-       else
-               state = extcon_data->state_off;
-
-       if (state)
-               return sprintf(buf, "%s\n", state);
-       return -EINVAL;
-}
-
 static int gpio_extcon_probe(struct platform_device *pdev)
 {
        struct gpio_extcon_platform_data *pdata = dev_get_platdata(&pdev->dev);
@@ -110,8 +94,6 @@ static int gpio_extcon_probe(struct platform_device *pdev)
        extcon_data->state_on = pdata->state_on;
        extcon_data->state_off = pdata->state_off;
        extcon_data->check_on_resume = pdata->check_on_resume;
-       if (pdata->state_on && pdata->state_off)
-               extcon_data->edev->print_state = extcon_gpio_print_state;
 
        ret = devm_gpio_request_one(&pdev->dev, extcon_data->gpio, GPIOF_DIR_IN,
                                    pdev->name);