LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 6/7] spi : use class iteration api
@ 2008-01-12  9:57 Dave Young
  2008-01-16  0:52 ` Dave Young
  2008-01-22  6:03 ` [PATCH 6/6] " Dave Young
  0 siblings, 2 replies; 7+ messages in thread
From: Dave Young @ 2008-01-12  9:57 UTC (permalink / raw)
  To: David Brownell; +Cc: gregkh, linux-kernel, spi-devel-general

Convert to use the class iteration api.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 6/7] spi : use class iteration api
  2008-01-12  9:57 [PATCH 6/7] spi : use class iteration api Dave Young
@ 2008-01-16  0:52 ` Dave Young
  2008-01-22  6:03 ` [PATCH 6/6] " Dave Young
  1 sibling, 0 replies; 7+ messages in thread
From: Dave Young @ 2008-01-16  0:52 UTC (permalink / raw)
  To: David Brownell; +Cc: gregkh, linux-kernel, spi-devel-general

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

Convert to use the class iteration api.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH 6/6] spi : use class iteration api
  2008-01-12  9:57 [PATCH 6/7] spi : use class iteration api Dave Young
  2008-01-16  0:52 ` Dave Young
@ 2008-01-22  6:03 ` Dave Young
  2008-01-22  6:56   ` David Brownell
  1 sibling, 1 reply; 7+ messages in thread
From: Dave Young @ 2008-01-22  6:03 UTC (permalink / raw)
  To: David Brownell; +Cc: gregkh, linux-kernel, spi-devel-general

Convert to use the class iteration api.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 6/6] spi : use class iteration api
  2008-01-22  6:03 ` [PATCH 6/6] " Dave Young
@ 2008-01-22  6:56   ` David Brownell
  2008-01-22  6:57     ` Dave Young
  2008-01-22  7:14     ` Dave Young
  0 siblings, 2 replies; 7+ messages in thread
From: David Brownell @ 2008-01-22  6:56 UTC (permalink / raw)
  To: Dave Young; +Cc: gregkh, linux-kernel, spi-devel-general

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.


^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 6/6] spi : use class iteration api
  2008-01-22  6:56   ` David Brownell
@ 2008-01-22  6:57     ` Dave Young
  2008-01-22  7:14     ` Dave Young
  1 sibling, 0 replies; 7+ messages in thread
From: Dave Young @ 2008-01-22  6:57 UTC (permalink / raw)
  To: David Brownell; +Cc: gregkh, linux-kernel, spi-devel-general

On Jan 22, 2008 2:56 PM, David Brownell <david-b@pacbell.net> 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.

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 6/6] spi : use class iteration api
  2008-01-22  6:56   ` David Brownell
  2008-01-22  6:57     ` Dave Young
@ 2008-01-22  7:14     ` Dave Young
  2008-01-22  7:41       ` David Brownell
  1 sibling, 1 reply; 7+ messages in thread
From: Dave Young @ 2008-01-22  7:14 UTC (permalink / raw)
  To: David Brownell; +Cc: gregkh, linux-kernel, spi-devel-general

Convert to use the class iteration api.

Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 

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

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH 6/6] spi : use class iteration api
  2008-01-22  7:14     ` Dave Young
@ 2008-01-22  7:41       ` David Brownell
  0 siblings, 0 replies; 7+ messages in thread
From: David Brownell @ 2008-01-22  7:41 UTC (permalink / raw)
  To: Dave Young; +Cc: gregkh, linux-kernel, spi-devel-general

On Monday 21 January 2008, Dave Young wrote:
> Convert to use the class iteration api.
> 
> Signed-off-by: Dave Young <hidave.darkstar@gmail.com> 

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



^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2008-01-22  7:42 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-12  9:57 [PATCH 6/7] spi : use class iteration api Dave Young
2008-01-16  0:52 ` Dave Young
2008-01-22  6:03 ` [PATCH 6/6] " Dave Young
2008-01-22  6:56   ` David Brownell
2008-01-22  6:57     ` Dave Young
2008-01-22  7:14     ` Dave Young
2008-01-22  7:41       ` David Brownell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).