Merge tag 'fbdev-omap-dt-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba...

[karo-tx-linux.git] / drivers / extcon / extcon-palmas.c

diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c
index ddff2b72f0a898b4e50fe69800dab356e3af9358..7417ce84eb2dbd6e50e8bc216fd666599eecf398 100644 (file)
--- a/drivers/extcon/extcon-palmas.c
+++ b/drivers/extcon/extcon-palmas.c
@@ -23,6 +23,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/mfd/palmas.h>
 #include <linux/of.h>
@@ -56,7 +57,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
        if (vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS) {
                if (palmas_usb->linkstat != PALMAS_USB_STATE_VBUS) {
                        palmas_usb->linkstat = PALMAS_USB_STATE_VBUS;
-                       extcon_set_cable_state(&palmas_usb->edev, "USB", true);
+                       extcon_set_cable_state(palmas_usb->edev, "USB", true);
                        dev_info(palmas_usb->dev, "USB cable is attached\n");
                } else {
                        dev_dbg(palmas_usb->dev,
@@ -65,7 +66,7 @@ static irqreturn_t palmas_vbus_irq_handler(int irq, void *_palmas_usb)
        } else if (!(vbus_line_state & PALMAS_INT3_LINE_STATE_VBUS)) {
                if (palmas_usb->linkstat == PALMAS_USB_STATE_VBUS) {
                        palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-                       extcon_set_cable_state(&palmas_usb->edev, "USB", false);
+                       extcon_set_cable_state(palmas_usb->edev, "USB", false);
                        dev_info(palmas_usb->dev, "USB cable is detached\n");
                } else {
                        dev_dbg(palmas_usb->dev,
@@ -92,7 +93,7 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
                        PALMAS_USB_ID_INT_LATCH_CLR,
                        PALMAS_USB_ID_INT_EN_HI_CLR_ID_GND);
                palmas_usb->linkstat = PALMAS_USB_STATE_ID;
-               extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
+               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true);
                dev_info(palmas_usb->dev, "USB-HOST cable is attached\n");
        } else if ((set & PALMAS_USB_ID_INT_SRC_ID_FLOAT) &&
                                (id_src & PALMAS_USB_ID_INT_SRC_ID_FLOAT)) {
@@ -100,17 +101,17 @@ static irqreturn_t palmas_id_irq_handler(int irq, void *_palmas_usb)
                        PALMAS_USB_ID_INT_LATCH_CLR,
                        PALMAS_USB_ID_INT_EN_HI_CLR_ID_FLOAT);
                palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-               extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", false);
+               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false);
                dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
        } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_ID) &&
                                (!(set & PALMAS_USB_ID_INT_SRC_ID_GND))) {
                palmas_usb->linkstat = PALMAS_USB_STATE_DISCONNECT;
-               extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", false);
+               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", false);
                dev_info(palmas_usb->dev, "USB-HOST cable is detached\n");
        } else if ((palmas_usb->linkstat == PALMAS_USB_STATE_DISCONNECT) &&
                                (id_src & PALMAS_USB_ID_INT_SRC_ID_GND)) {
                palmas_usb->linkstat = PALMAS_USB_STATE_ID;
-               extcon_set_cable_state(&palmas_usb->edev, "USB-HOST", true);
+               extcon_set_cable_state(palmas_usb->edev, "USB-HOST", true);
                dev_info(palmas_usb->dev, " USB-HOST cable is attached\n");
        }
 
@@ -186,13 +187,20 @@ static int palmas_usb_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, palmas_usb);
 
-       palmas_usb->edev.supported_cable = palmas_extcon_cable;
-       palmas_usb->edev.dev.parent = palmas_usb->dev;
-       palmas_usb->edev.mutually_exclusive = mutually_exclusive;
+       palmas_usb->edev = devm_extcon_dev_allocate(&pdev->dev,
+                                                   palmas_extcon_cable);
+       if (IS_ERR(palmas_usb->edev)) {
+               dev_err(&pdev->dev, "failed to allocate extcon device\n");
+               return -ENOMEM;
+       }
+       palmas_usb->edev->name = kstrdup(node->name, GFP_KERNEL);
+       palmas_usb->edev->dev.parent = palmas_usb->dev;
+       palmas_usb->edev->mutually_exclusive = mutually_exclusive;
 
-       status = extcon_dev_register(&palmas_usb->edev);
+       status = devm_extcon_dev_register(&pdev->dev, palmas_usb->edev);
        if (status) {
                dev_err(&pdev->dev, "failed to register extcon device\n");
+               kfree(palmas_usb->edev->name);
                return status;
        }
 
@@ -206,7 +214,8 @@ static int palmas_usb_probe(struct platform_device *pdev)
                if (status < 0) {
                        dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                                        palmas_usb->id_irq, status);
-                       goto fail_extcon;
+                       kfree(palmas_usb->edev->name);
+                       return status;
                }
        }
 
@@ -220,25 +229,21 @@ static int palmas_usb_probe(struct platform_device *pdev)
                if (status < 0) {
                        dev_err(&pdev->dev, "can't get IRQ %d, err %d\n",
                                        palmas_usb->vbus_irq, status);
-                       goto fail_extcon;
+                       kfree(palmas_usb->edev->name);
+                       return status;
                }
        }
 
        palmas_enable_irq(palmas_usb);
        device_set_wakeup_capable(&pdev->dev, true);
        return 0;
-
-fail_extcon:
-       extcon_dev_unregister(&palmas_usb->edev);
-
-       return status;
 }
 
 static int palmas_usb_remove(struct platform_device *pdev)
 {
        struct palmas_usb *palmas_usb = platform_get_drvdata(pdev);
 
-       extcon_dev_unregister(&palmas_usb->edev);
+       kfree(palmas_usb->edev->name);
 
        return 0;
 }