Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 098f9fb0 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Linus Torvalds
Browse files

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: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b9364b5

drivers/w1/slaves/w1_ds2760.c

+5 −23
Original line number Original line Diff line number Diff line
@@ -121,25 +121,14 @@ static const struct attribute_group *w1_ds2760_groups[] = { 
	NULL,

	NULL,

};

};





static DEFINE_IDA(bat_ida);



static int w1_ds2760_add_slave(struct w1_slave *sl)

static int w1_ds2760_add_slave(struct w1_slave *sl)

{

{

	int ret;

	int ret;

	int id;

	struct platform_device *pdev;

	struct platform_device *pdev;





	id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);

	pdev = platform_device_alloc("ds2760-battery", PLATFORM_DEVID_AUTO);

	if (id < 0) {

	if (!pdev)

		ret = id;

		return -ENOMEM;

		goto noid;

	}



	pdev = platform_device_alloc("ds2760-battery", id);

	if (!pdev) {

		ret = -ENOMEM;

		goto pdev_alloc_failed;

	}

	pdev->dev.parent = &sl->dev;

	pdev->dev.parent = &sl->dev;





	ret = platform_device_add(pdev);

	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);

	dev_set_drvdata(&sl->dev, pdev);





	goto success;

	return 0;





pdev_add_failed:

pdev_add_failed:

	platform_device_put(pdev);

	platform_device_put(pdev);

pdev_alloc_failed:



	ida_simple_remove(&bat_ida, id);

noid:

success:

	return ret;

	return ret;

}

}





static void w1_ds2760_remove_slave(struct w1_slave *sl)

static void w1_ds2760_remove_slave(struct w1_slave *sl)

{

{

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	int id = pdev->id;





	platform_device_unregister(pdev);

	platform_device_unregister(pdev);

	ida_simple_remove(&bat_ida, id);

}

}





static struct w1_family_ops w1_ds2760_fops = {

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)

static int __init w1_ds2760_init(void)

{

{

	pr_info("1-Wire driver for the DS2760 battery monitor chip - (c) 2004-2005, Szabolcs Gyurko\n");

	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);

	return w1_register_family(&w1_ds2760_family);

}

}





static void __exit w1_ds2760_exit(void)

static void __exit w1_ds2760_exit(void)

{

{

	w1_unregister_family(&w1_ds2760_family);

	w1_unregister_family(&w1_ds2760_family);

	ida_destroy(&bat_ida);

}

}





EXPORT_SYMBOL(w1_ds2760_read);

EXPORT_SYMBOL(w1_ds2760_read);

drivers/w1/slaves/w1_ds2780.c

+4 −21
Original line number Original line Diff line number Diff line
@@ -113,25 +113,14 @@ static const struct attribute_group *w1_ds2780_groups[] = { 
	NULL,

	NULL,

};

};





static DEFINE_IDA(bat_ida);



static int w1_ds2780_add_slave(struct w1_slave *sl)

static int w1_ds2780_add_slave(struct w1_slave *sl)

{

{

	int ret;

	int ret;

	int id;

	struct platform_device *pdev;

	struct platform_device *pdev;





	id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);

	pdev = platform_device_alloc("ds2780-battery", PLATFORM_DEVID_AUTO);

	if (id < 0) {

	if (!pdev)

		ret = id;

		return -ENOMEM;

		goto noid;

	}



	pdev = platform_device_alloc("ds2780-battery", id);

	if (!pdev) {

		ret = -ENOMEM;

		goto pdev_alloc_failed;

	}

	pdev->dev.parent = &sl->dev;

	pdev->dev.parent = &sl->dev;





	ret = platform_device_add(pdev);

	ret = platform_device_add(pdev);
@@ -144,19 +133,15 @@ static int w1_ds2780_add_slave(struct w1_slave *sl) 




pdev_add_failed:

pdev_add_failed:

	platform_device_put(pdev);

	platform_device_put(pdev);

pdev_alloc_failed:



	ida_simple_remove(&bat_ida, id);

noid:

	return ret;

	return ret;

}

}





static void w1_ds2780_remove_slave(struct w1_slave *sl)

static void w1_ds2780_remove_slave(struct w1_slave *sl)

{

{

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	int id = pdev->id;





	platform_device_unregister(pdev);

	platform_device_unregister(pdev);

	ida_simple_remove(&bat_ida, id);

}

}





static struct w1_family_ops w1_ds2780_fops = {

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)

static int __init w1_ds2780_init(void)

{

{

	ida_init(&bat_ida);

	return w1_register_family(&w1_ds2780_family);

	return w1_register_family(&w1_ds2780_family);

}

}





static void __exit w1_ds2780_exit(void)

static void __exit w1_ds2780_exit(void)

{

{

	w1_unregister_family(&w1_ds2780_family);

	w1_unregister_family(&w1_ds2780_family);

	ida_destroy(&bat_ida);

}

}





module_init(w1_ds2780_init);

module_init(w1_ds2780_init);

drivers/w1/slaves/w1_ds2781.c

+4 −22
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/types.h>

#include <linux/types.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/idr.h>





#include "../w1.h"

#include "../w1.h"

#include "../w1_int.h"

#include "../w1_int.h"
@@ -111,25 +110,14 @@ static const struct attribute_group *w1_ds2781_groups[] = { 
	NULL,

	NULL,

};

};





static DEFINE_IDA(bat_ida);



static int w1_ds2781_add_slave(struct w1_slave *sl)

static int w1_ds2781_add_slave(struct w1_slave *sl)

{

{

	int ret;

	int ret;

	int id;

	struct platform_device *pdev;

	struct platform_device *pdev;





	id = ida_simple_get(&bat_ida, 0, 0, GFP_KERNEL);

	pdev = platform_device_alloc("ds2781-battery", PLATFORM_DEVID_AUTO);

	if (id < 0) {

	if (!pdev)

		ret = id;

		return -ENOMEM;

		goto noid;

	}



	pdev = platform_device_alloc("ds2781-battery", id);

	if (!pdev) {

		ret = -ENOMEM;

		goto pdev_alloc_failed;

	}

	pdev->dev.parent = &sl->dev;

	pdev->dev.parent = &sl->dev;





	ret = platform_device_add(pdev);

	ret = platform_device_add(pdev);
@@ -142,19 +130,15 @@ static int w1_ds2781_add_slave(struct w1_slave *sl) 




pdev_add_failed:

pdev_add_failed:

	platform_device_put(pdev);

	platform_device_put(pdev);

pdev_alloc_failed:



	ida_simple_remove(&bat_ida, id);

noid:

	return ret;

	return ret;

}

}





static void w1_ds2781_remove_slave(struct w1_slave *sl)

static void w1_ds2781_remove_slave(struct w1_slave *sl)

{

{

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	struct platform_device *pdev = dev_get_drvdata(&sl->dev);

	int id = pdev->id;





	platform_device_unregister(pdev);

	platform_device_unregister(pdev);

	ida_simple_remove(&bat_ida, id);

}

}





static struct w1_family_ops w1_ds2781_fops = {

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)

static int __init w1_ds2781_init(void)

{

{

	ida_init(&bat_ida);

	return w1_register_family(&w1_ds2781_family);

	return w1_register_family(&w1_ds2781_family);

}

}





static void __exit w1_ds2781_exit(void)

static void __exit w1_ds2781_exit(void)

{

{

	w1_unregister_family(&w1_ds2781_family);

	w1_unregister_family(&w1_ds2781_family);

	ida_destroy(&bat_ida);

}

}





module_init(w1_ds2781_init);

module_init(w1_ds2781_init);