2008-01-12 09:53:58

by Dave Young

Subject: [PATCH 6/7] spi : use class iteration api

Convert to use the class iteration api.

Signed-off-by: Dave Young <[email protected]>

---
drivers/spi/spi.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)

diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
--- linux/drivers/spi/spi.c 2008-01-11 18:06:38.000000000 +0800
+++ linux.new/drivers/spi/spi.c 2008-01-11 18:06:38.000000000 +0800
@@ -485,6 +485,17 @@ void spi_unregister_master(struct spi_ma
}
EXPORT_SYMBOL_GPL(spi_unregister_master);

+static int __spi_master_match(struct device *dev, void *data)
+{
+ struct spi_master *m;
+ u16 *bus_num = (u16 *)data;
+
+ m = container_of(dev, struct spi_master, dev);
+ if (m->bus_num == *bus_num)
+ return 1;
+ return 0;
+}
+
/**
* spi_busnum_to_master - look up master associated with bus_num
* @bus_num: the master's bus number
@@ -499,17 +510,12 @@ struct spi_master *spi_busnum_to_master(
{
struct device *dev;
struct spi_master *master = NULL;
- struct spi_master *m;

- down(&spi_master_class.sem);
- list_for_each_entry(dev, &spi_master_class.children, node) {
- m = container_of(dev, struct spi_master, dev);
- if (m->bus_num == bus_num) {
- master = spi_master_get(m);
- break;
- }
- }
- up(&spi_master_class.sem);
+ dev = class_find_device(&spi_master_class, &bus_num,
+ __spi_master_match);
+ if (dev)
+ master = container_of(dev, struct spi_master, dev);
+ /* reference got in class_find_device */
return master;
}
EXPORT_SYMBOL_GPL(spi_busnum_to_master);

2008-01-16 00:49:36

by Dave Young

Subject: Re: [PATCH 6/7] spi : use class iteration api

Update the patch with minor return path changes in match function:

Convert to use the class iteration api.

Signed-off-by: Dave Young <[email protected]>

---
drivers/spi/spi.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)

diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
--- linux/drivers/spi/spi.c 2008-01-16 08:43:35.000000000 +0800
+++ linux.new/drivers/spi/spi.c 2008-01-16 08:43:35.000000000 +0800
@@ -485,6 +485,15 @@ void spi_unregister_master(struct spi_ma
}
EXPORT_SYMBOL_GPL(spi_unregister_master);

+static int __spi_master_match(struct device *dev, void *data)
+{
+ struct spi_master *m;
+ u16 *bus_num = (u16 *)data;
+
+ m = container_of(dev, struct spi_master, dev);
+ return m->bus_num == *bus_num;
+}
+
/**
* spi_busnum_to_master - look up master associated with bus_num
* @bus_num: the master's bus number
@@ -499,17 +508,12 @@ struct spi_master *spi_busnum_to_master(
{
struct device *dev;
struct spi_master *master = NULL;
- struct spi_master *m;

- down(&spi_master_class.sem);
- list_for_each_entry(dev, &spi_master_class.children, node) {
- m = container_of(dev, struct spi_master, dev);
- if (m->bus_num == bus_num) {
- master = spi_master_get(m);
- break;
- }
- }
- up(&spi_master_class.sem);
+ dev = class_find_device(&spi_master_class, &bus_num,
+ __spi_master_match);
+ if (dev)
+ master = container_of(dev, struct spi_master, dev);
+ /* reference got in class_find_device */
return master;
}
EXPORT_SYMBOL_GPL(spi_busnum_to_master);

2008-01-22 06:02:17

by Dave Young

Subject: [PATCH 6/6] spi : use class iteration api

Convert to use the class iteration api.

Signed-off-by: Dave Young <[email protected]>

---
drivers/spi/spi.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)

diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
--- linux/drivers/spi/spi.c 2008-01-16 08:43:35.000000000 +0800
+++ linux.new/drivers/spi/spi.c 2008-01-16 08:43:35.000000000 +0800
@@ -485,6 +485,15 @@ void spi_unregister_master(struct spi_ma
}
EXPORT_SYMBOL_GPL(spi_unregister_master);

+static int __spi_master_match(struct device *dev, void *data)
+{
+ struct spi_master *m;
+ u16 *bus_num = (u16 *)data;
+
+ m = container_of(dev, struct spi_master, dev);
+ return m->bus_num == *bus_num;
+}
+
/**
* spi_busnum_to_master - look up master associated with bus_num
* @bus_num: the master's bus number
@@ -499,17 +508,12 @@ struct spi_master *spi_busnum_to_master(
{
struct device *dev;
struct spi_master *master = NULL;
- struct spi_master *m;

- down(&spi_master_class.sem);
- list_for_each_entry(dev, &spi_master_class.children, node) {
- m = container_of(dev, struct spi_master, dev);
- if (m->bus_num == bus_num) {
- master = spi_master_get(m);
- break;
- }
- }
- up(&spi_master_class.sem);
+ dev = class_find_device(&spi_master_class, &bus_num,
+ __spi_master_match);
+ if (dev)
+ master = container_of(dev, struct spi_master, dev);
+ /* reference got in class_find_device */
return master;
}
EXPORT_SYMBOL_GPL(spi_busnum_to_master);

2008-01-22 06:56:22

by David Brownell

Subject: Re: [PATCH 6/6] spi : use class iteration api

On Monday 21 January 2008, Dave Young wrote:
> +static int __spi_master_match(struct device *dev, void *data)
> +{
> +???????struct spi_master *m;
> +???????u16 *bus_num = (u16 *)data;

That's "void *data" so "u16 *bus_num = data" is preferred.

2008-01-22 06:57:59

by Dave Young

Subject: Re: [PATCH 6/6] spi : use class iteration api

On Jan 22, 2008 2:56 PM, David Brownell <[email protected]> wrote:
> On Monday 21 January 2008, Dave Young wrote:
> > +static int __spi_master_match(struct device *dev, void *data)
> > +{
> > +struct spi_master *m;
> > +u16 *bus_num = (u16 *)data;
>
> That's "void *data" so "u16 *bus_num = data" is preferred.
>
Fine.

2008-01-22 07:13:00

by Dave Young

Subject: Re: [PATCH 6/6] spi : use class iteration api

Convert to use the class iteration api.

Signed-off-by: Dave Young <[email protected]>

---
drivers/spi/spi.c | 24 ++++++++++++++----------
1 file changed, 14 insertions(+), 10 deletions(-)

diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
--- linux/drivers/spi/spi.c 2008-01-22 15:09:49.000000000 +0800
+++ linux.new/drivers/spi/spi.c 2008-01-22 15:09:49.000000000 +0800
@@ -485,6 +485,15 @@ void spi_unregister_master(struct spi_ma
}
EXPORT_SYMBOL_GPL(spi_unregister_master);

+static int __spi_master_match(struct device *dev, void *data)
+{
+ struct spi_master *m;
+ u16 *bus_num = data;
+
+ m = container_of(dev, struct spi_master, dev);
+ return m->bus_num == *bus_num;
+}
+
/**
* spi_busnum_to_master - look up master associated with bus_num
* @bus_num: the master's bus number
@@ -499,17 +508,12 @@ struct spi_master *spi_busnum_to_master(
{
struct device *dev;
struct spi_master *master = NULL;
- struct spi_master *m;

- down(&spi_master_class.sem);
- list_for_each_entry(dev, &spi_master_class.children, node) {
- m = container_of(dev, struct spi_master, dev);
- if (m->bus_num == bus_num) {
- master = spi_master_get(m);
- break;
- }
- }
- up(&spi_master_class.sem);
+ dev = class_find_device(&spi_master_class, &bus_num,
+ __spi_master_match);
+ if (dev)
+ master = container_of(dev, struct spi_master, dev);
+ /* reference got in class_find_device */
return master;
}
EXPORT_SYMBOL_GPL(spi_busnum_to_master);

2008-01-22 07:42:01

by David Brownell

Subject: Re: [PATCH 6/6] spi : use class iteration api

On Monday 21 January 2008, Dave Young wrote:
> Convert to use the class iteration api.
>
> Signed-off-by: Dave Young <[email protected]>

Ack.


> ---
> drivers/spi/spi.c | 24 ++++++++++++++----------
> 1 file changed, 14 insertions(+), 10 deletions(-)
>
> diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
> --- linux/drivers/spi/spi.c 2008-01-22 15:09:49.000000000 +0800
> +++ linux.new/drivers/spi/spi.c 2008-01-22 15:09:49.000000000 +0800
> @@ -485,6 +485,15 @@ void spi_unregister_master(struct spi_ma
> }
> EXPORT_SYMBOL_GPL(spi_unregister_master);
>
> +static int __spi_master_match(struct device *dev, void *data)
> +{
> + struct spi_master *m;
> + u16 *bus_num = data;
> +
> + m = container_of(dev, struct spi_master, dev);
> + return m->bus_num == *bus_num;
> +}
> +
> /**
> * spi_busnum_to_master - look up master associated with bus_num
> * @bus_num: the master's bus number
> @@ -499,17 +508,12 @@ struct spi_master *spi_busnum_to_master(
> {
> struct device *dev;
> struct spi_master *master = NULL;
> - struct spi_master *m;
>
> - down(&spi_master_class.sem);
> - list_for_each_entry(dev, &spi_master_class.children, node) {
> - m = container_of(dev, struct spi_master, dev);
> - if (m->bus_num == bus_num) {
> - master = spi_master_get(m);
> - break;
> - }
> - }
> - up(&spi_master_class.sem);
> + dev = class_find_device(&spi_master_class, &bus_num,
> + __spi_master_match);
> + if (dev)
> + master = container_of(dev, struct spi_master, dev);
> + /* reference got in class_find_device */
> return master;
> }
> EXPORT_SYMBOL_GPL(spi_busnum_to_master);
>