w1: remove need for ida and use PLATFORM_DEVID_AUTO

PLATFORM_DEVID_AUTO can be used to have the platform core assign a
unique ID instead of manually creating one with IDA.  Do this in all
applicable drivers.

Link: http://lkml.kernel.org/r/20160531204313.20979-1-afd@ti.com
Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index d9079d48d1122c30fb6ca5d1948f829cd7024909..59a81cfe64d5e4b18c0ea18bf4ac28f2f1f2d417 100644 (file)
--- a/drivers/w1/slaves/w1_ds2760.c
+++ b/drivers/w1/slaves/w1_ds2760.c
@@ -121,25 +121,14 @@ static const struct attribute_group *w1_ds2760_groups[] = {
        NULL,
 };
 
-static DEFINE_IDA(bat_ida);
-
 static int w1_ds2760_add_slave(struct w1_slave *sl)
 {
        int ret;
-       int id;
        struct platform_device *pdev;
 
-       id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
-               goto noid;
-       }
-
-       pdev = platform_device_alloc("ds2760-battery", id);
-       if (!pdev) {
-               ret = -ENOMEM;
-               goto pdev_alloc_failed;
-       }
+       pdev = platform_device_alloc("ds2760-battery", PLATFORM_DEVID_AUTO);
+       if (!pdev)
+               return -ENOMEM;
        pdev->dev.parent = &sl->dev;
 
        ret = platform_device_add(pdev);
@@ -148,24 +137,19 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
 
        dev_set_drvdata(&sl->dev, pdev);
 
-       goto success;
+       return 0;
 
 pdev_add_failed:
        platform_device_put(pdev);
-pdev_alloc_failed:
-       ida_simple_remove(&bat_ida, id);
-noid:
-success:
+
        return ret;
 }
 
 static void w1_ds2760_remove_slave(struct w1_slave *sl)
 {
        struct platform_device *pdev = dev_get_drvdata(&sl->dev);
-       int id = pdev->id;
 
        platform_device_unregister(pdev);
-       ida_simple_remove(&bat_ida, id);
 }
 
 static struct w1_family_ops w1_ds2760_fops = {
@@ -182,14 +166,12 @@ static struct w1_family w1_ds2760_family = {
 static int __init w1_ds2760_init(void)
 {
        pr_info("1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko\n");
-       ida_init(&bat_ida);
        return w1_register_family(&w1_ds2760_family);
 }
 
 static void __exit w1_ds2760_exit(void)
 {
        w1_unregister_family(&w1_ds2760_family);
-       ida_destroy(&bat_ida);
 }
 
 EXPORT_SYMBOL(w1_ds2760_read);

diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 50e85f7929d4e9d7212db91153c6c526647c40f2..e63eb86d66f174a52d5a06a1f6d9ee54a10aa574 100644 (file)
--- a/drivers/w1/slaves/w1_ds2780.c
+++ b/drivers/w1/slaves/w1_ds2780.c
@@ -113,25 +113,14 @@ static const struct attribute_group *w1_ds2780_groups[] = {
        NULL,
 };
 
-static DEFINE_IDA(bat_ida);
-
 static int w1_ds2780_add_slave(struct w1_slave *sl)
 {
        int ret;
-       int id;
        struct platform_device *pdev;
 
-       id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
-               goto noid;
-       }
-
-       pdev = platform_device_alloc("ds2780-battery", id);
-       if (!pdev) {
-               ret = -ENOMEM;
-               goto pdev_alloc_failed;
-       }
+       pdev = platform_device_alloc("ds2780-battery", PLATFORM_DEVID_AUTO);
+       if (!pdev)
+               return -ENOMEM;
        pdev->dev.parent = &sl->dev;
 
        ret = platform_device_add(pdev);
@@ -144,19 +133,15 @@ static int w1_ds2780_add_slave(struct w1_slave *sl)
 
 pdev_add_failed:
        platform_device_put(pdev);
-pdev_alloc_failed:
-       ida_simple_remove(&bat_ida, id);
-noid:
+
        return ret;
 }
 
 static void w1_ds2780_remove_slave(struct w1_slave *sl)
 {
        struct platform_device *pdev = dev_get_drvdata(&sl->dev);
-       int id = pdev->id;
 
        platform_device_unregister(pdev);
-       ida_simple_remove(&bat_ida, id);
 }
 
 static struct w1_family_ops w1_ds2780_fops = {
@@ -172,14 +157,12 @@ static struct w1_family w1_ds2780_family = {
 
 static int __init w1_ds2780_init(void)
 {
-       ida_init(&bat_ida);
        return w1_register_family(&w1_ds2780_family);
 }
 
 static void __exit w1_ds2780_exit(void)
 {
        w1_unregister_family(&w1_ds2780_family);
-       ida_destroy(&bat_ida);
 }
 
 module_init(w1_ds2780_init);

diff --git a/drivers/w1/slaves/w1_ds2781.c b/drivers/w1/slaves/w1_ds2781.c
index 1eb98fb1688dcdae227efcad1c5a62745cbf1a06..99b0f4dc0e31080f66d75574580a30ca4954757c 100644 (file)
--- a/drivers/w1/slaves/w1_ds2781.c
+++ b/drivers/w1/slaves/w1_ds2781.c
@@ -17,7 +17,6 @@
 #include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/mutex.h>
-#include <linux/idr.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -111,25 +110,14 @@ static const struct attribute_group *w1_ds2781_groups[] = {
        NULL,
 };
 
-static DEFINE_IDA(bat_ida);
-
 static int w1_ds2781_add_slave(struct w1_slave *sl)
 {
        int ret;
-       int id;
        struct platform_device *pdev;
 
-       id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);
-       if (id < 0) {
-               ret = id;
-               goto noid;
-       }
-
-       pdev = platform_device_alloc("ds2781-battery", id);
-       if (!pdev) {
-               ret = -ENOMEM;
-               goto pdev_alloc_failed;
-       }
+       pdev = platform_device_alloc("ds2781-battery", PLATFORM_DEVID_AUTO);
+       if (!pdev)
+               return -ENOMEM;
        pdev->dev.parent = &sl->dev;
 
        ret = platform_device_add(pdev);
@@ -142,19 +130,15 @@ static int w1_ds2781_add_slave(struct w1_slave *sl)
 
 pdev_add_failed:
        platform_device_put(pdev);
-pdev_alloc_failed:
-       ida_simple_remove(&bat_ida, id);
-noid:
+
        return ret;
 }
 
 static void w1_ds2781_remove_slave(struct w1_slave *sl)
 {
        struct platform_device *pdev = dev_get_drvdata(&sl->dev);
-       int id = pdev->id;
 
        platform_device_unregister(pdev);
-       ida_simple_remove(&bat_ida, id);
 }
 
 static struct w1_family_ops w1_ds2781_fops = {
@@ -170,14 +154,12 @@ static struct w1_family w1_ds2781_family = {
 
 static int __init w1_ds2781_init(void)
 {
-       ida_init(&bat_ida);
        return w1_register_family(&w1_ds2781_family);
 }
 
 static void __exit w1_ds2781_exit(void)
 {
        w1_unregister_family(&w1_ds2781_family);
-       ida_destroy(&bat_ida);
 }
 
 module_init(w1_ds2781_init);