Merge tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core changes from Greg Kroah-Hartman:
 "Here's the big driver core pull request for 3.6-rc1.

  Unlike 3.5, this kernel should be a lot tamer, with the printk changes
  now settled down.  All we have here is some extcon driver updates, w1
  driver updates, a few printk cleanups that weren't needed for 3.5, but
  are good to have now, and some other minor fixes/changes in the driver
  core.

  All of these have been in the linux-next releases for a while now.

  Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"

* tag 'driver-core-3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (38 commits)
  printk: Export struct log size and member offsets through vmcoreinfo
  Drivers: hv: Change the hex constant to a decimal constant
  driver core: don't trigger uevent after failure
  extcon: MAX77693: Add extcon-max77693 driver to support Maxim MAX77693 MUIC device
  sysfs: fail dentry revalidation after namespace change fix
  sysfs: fail dentry revalidation after namespace change
  extcon: spelling of detach in function doc
  extcon: arizona: Stop microphone detection if we give up on it
  extcon: arizona: Update cable reporting calls and split headset
  PM / Runtime: Do not increment device usage counts before probing
  kmsg - do not flush partial lines when the console is busy
  kmsg - export "continuation record" flag to /dev/kmsg
  kmsg - avoid warning for CONFIG_PRINTK=n compilations
  kmsg - properly print over-long continuation lines
  driver-core: Use kobj_to_dev instead of re-implementing it
  driver-core: Move kobj_to_dev from genhd.h to device.h
  driver core: Move deferred devices to the end of dpm_list before probing
  driver core: move uevent call to driver_register
  driver core: fix shutdown races with probe/remove(v3)
  Extcon: Arizona: Add driver for Wolfson Arizona class devices
  ...

1 files changed, 5 insertions, 12 deletions

diff --git a/drivers/extcon/extcon_gpio.c b/drivers/extcon/extcon_gpio.c
index 8a0dcc11c7c7..fe3db45fa83c 100644
--- a/drivers/extcon/extcon_gpio.c
+++ b/drivers/extcon/extcon_gpio.c
@@ -105,25 +105,25 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev)
 
         ret = extcon_dev_register(&extcon_data->edev, &pdev->dev);
         if (ret < 0)
-                goto err_extcon_dev_register;
+                return ret;
 
         ret = gpio_request_one(extcon_data->gpio, GPIOF_DIR_IN, pdev->name);
         if (ret < 0)
-                goto err_request_gpio;
+                goto err;
 
         INIT_DELAYED_WORK(&extcon_data->work, gpio_extcon_work);
 
         extcon_data->irq = gpio_to_irq(extcon_data->gpio);
         if (extcon_data->irq < 0) {
                 ret = extcon_data->irq;
-                goto err_detect_irq_num_failed;
+                goto err;
         }
 
         ret = request_any_context_irq(extcon_data->irq, gpio_irq_handler,
                                       pdata->irq_flags, pdev->name,
                                       extcon_data);
         if (ret < 0)
-                goto err_request_irq;
+                goto err;
 
         platform_set_drvdata(pdev, extcon_data);
         /* Perform initial detection */
@@ -131,13 +131,8 @@ static int __devinit gpio_extcon_probe(struct platform_device *pdev)
 
         return 0;
 
-err_request_irq:
-err_detect_irq_num_failed:
-        gpio_free(extcon_data->gpio);
-err_request_gpio:
+err:
         extcon_dev_unregister(&extcon_data->edev);
-err_extcon_dev_register:
-        devm_kfree(&pdev->dev, extcon_data);
 
         return ret;
 }
@@ -148,9 +143,7 @@ static int __devexit gpio_extcon_remove(struct platform_device *pdev)
 
         cancel_delayed_work_sync(&extcon_data->work);
         free_irq(extcon_data->irq, extcon_data);
-        gpio_free(extcon_data->gpio);
         extcon_dev_unregister(&extcon_data->edev);
-        devm_kfree(&pdev->dev, extcon_data);
 
         return 0;
 }