Merge tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char/misc driver patches from Greg Kroah-Hartman:
 "Here's the big char/misc driver patches for 3.9-rc1.

  Nothing major here, just lots of different driver updates (mei,
  hyperv, ipack, extcon, vmci, etc.).

  All of these have been in the linux-next tree for a while."

* tag 'char-misc-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (209 commits)
  w1: w1_therm: Add force-pullup option for "broken" sensors
  w1: ds2482: Added 1-Wire pull-up support to the driver
  vme: add missing put_device() after device_register() fails
  extcon: max8997: Use workqueue to check cable state after completing boot of platform
  extcon: max8997: Set default UART/USB path on probe
  extcon: max8997: Consolidate duplicate code for checking ADC/CHG cable type
  extcon: max8997: Set default of ADC debounce time during initialization
  extcon: max8997: Remove duplicate code related to set H/W line path
  extcon: max8997: Move defined constant to header file
  extcon: max77693: Make max77693_extcon_cable static
  extcon: max8997: Remove unreachable code
  extcon: max8997: Make max8997_extcon_cable static
  extcon: max77693: Remove unnecessary goto statement to improve readability
  extcon: max77693: Convert to devm_input_allocate_device()
  extcon: gpio: Rename filename of extcon-gpio.c according to kernel naming style
  CREDITS: update email and address of Harald Hoyer
  extcon: arizona: Use MICDET for final microphone identification
  extcon: arizona: Always take the first HPDET reading as the final one
  extcon: arizona: Clear _trig_sts bits after jack detection
  extcon: arizona: Don't HPDET magic when headphones are enabled
  ...

1 files changed, 18 insertions, 34 deletions

diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 7c294f4dc0ed..96cab6ac2b4e 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -13,6 +13,7 @@
 
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 #include <linux/irq.h>
 #include <linux/pm.h>
 #include <linux/platform_device.h>
@@ -459,43 +460,34 @@ static int ds1wm_probe(struct platform_device *pdev)
         if (!pdev)
                 return -ENODEV;
 
-        ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
+        ds1wm_data = devm_kzalloc(&pdev->dev, sizeof(*ds1wm_data), GFP_KERNEL);
         if (!ds1wm_data)
                 return -ENOMEM;
 
         platform_set_drvdata(pdev, ds1wm_data);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (!res) {
-                ret = -ENXIO;
-                goto err0;
-        }
-        ds1wm_data->map = ioremap(res->start, resource_size(res));
-        if (!ds1wm_data->map) {
-                ret = -ENOMEM;
-                goto err0;
-        }
+        if (!res)
+                return -ENXIO;
+        ds1wm_data->map = devm_ioremap(&pdev->dev, res->start,
+                                       resource_size(res));
+        if (!ds1wm_data->map)
+                return -ENOMEM;
 
         /* calculate bus shift from mem resource */
         ds1wm_data->bus_shift = resource_size(res) >> 3;
 
         ds1wm_data->pdev = pdev;
         ds1wm_data->cell = mfd_get_cell(pdev);
-        if (!ds1wm_data->cell) {
-                ret = -ENODEV;
-                goto err1;
-        }
+        if (!ds1wm_data->cell)
+                return -ENODEV;
         plat = pdev->dev.platform_data;
-        if (!plat) {
-                ret = -ENODEV;
-                goto err1;
-        }
+        if (!plat)
+                return -ENODEV;
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
-        if (!res) {
-                ret = -ENXIO;
-                goto err1;
-        }
+        if (!res)
+                return -ENXIO;
         ds1wm_data->irq = res->start;
         ds1wm_data->int_en_reg_none = (plat->active_high ? DS1WM_INTEN_IAS : 0);
         ds1wm_data->reset_recover_delay = plat->reset_recover_delay;
@@ -505,10 +497,10 @@ static int ds1wm_probe(struct platform_device *pdev)
         if (res->flags & IORESOURCE_IRQ_LOWEDGE)
                 irq_set_irq_type(ds1wm_data->irq, IRQ_TYPE_EDGE_FALLING);
 
-        ret = request_irq(ds1wm_data->irq, ds1wm_isr,
+        ret = devm_request_irq(&pdev->dev, ds1wm_data->irq, ds1wm_isr,
                         IRQF_DISABLED | IRQF_SHARED, "ds1wm", ds1wm_data);
         if (ret)
-                goto err1;
+                return ret;
 
         ds1wm_up(ds1wm_data);
 
@@ -516,17 +508,12 @@ static int ds1wm_probe(struct platform_device *pdev)
 
         ret = w1_add_master_device(&ds1wm_master);
         if (ret)
-                goto err2;
+                goto err;
 
         return 0;
 
-err2:
+err:
         ds1wm_down(ds1wm_data);
-        free_irq(ds1wm_data->irq, ds1wm_data);
-err1:
-        iounmap(ds1wm_data->map);
-err0:
-        kfree(ds1wm_data);
 
         return ret;
 }
@@ -560,9 +547,6 @@ static int ds1wm_remove(struct platform_device *pdev)
 
         w1_remove_master_device(&ds1wm_master);
         ds1wm_down(ds1wm_data);
-        free_irq(ds1wm_data->irq, ds1wm_data);
-        iounmap(ds1wm_data->map);
-        kfree(ds1wm_data);
 
         return 0;
 }