2007-12-29 01:15:25

by Dave Young

Subject: [PATCH 11/12] spi : Use mutex instead of semaphore in driver core

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

---
drivers/spi/spi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
--- linux/drivers/spi/spi.c 2007-12-28 10:47:38.000000000 +0800
+++ linux.new/drivers/spi/spi.c 2007-12-28 10:48:22.000000000 +0800
@@ -494,7 +494,7 @@ struct spi_master *spi_busnum_to_master(
struct spi_master *master = NULL;
struct spi_master *m;

- down(&spi_master_class.sem);
+ mutex_lock(&spi_master_class.mutex);
list_for_each_entry(dev, &spi_master_class.children, node) {
m = container_of(dev, struct spi_master, dev);
if (m->bus_num == bus_num) {
@@ -502,7 +502,7 @@ struct spi_master *spi_busnum_to_master(
break;
}
}
- up(&spi_master_class.sem);
+ mutex_unlock(&spi_master_class.mutex);
return master;
}
EXPORT_SYMBOL_GPL(spi_busnum_to_master);

2007-12-29 01:37:28

by David Brownell

Subject: Re: [PATCH 11/12] spi : Use mutex instead of semaphore in driver core

On Friday 28 December 2007, Dave Young wrote:
> Signed-off-by: Dave Young <[email protected]>

ACK ... if the driver core is changing, this is obvious.

> ---
> drivers/spi/spi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff -upr linux/drivers/spi/spi.c linux.new/drivers/spi/spi.c
> --- linux/drivers/spi/spi.c 2007-12-28 10:47:38.000000000 +0800
> +++ linux.new/drivers/spi/spi.c 2007-12-28 10:48:22.000000000 +0800
> @@ -494,7 +494,7 @@ struct spi_master *spi_busnum_to_master(
> struct spi_master *master = NULL;
> struct spi_master *m;
>
> - down(&spi_master_class.sem);
> + mutex_lock(&spi_master_class.mutex);
> list_for_each_entry(dev, &spi_master_class.children, node) {
> m = container_of(dev, struct spi_master, dev);
> if (m->bus_num == bus_num) {
> @@ -502,7 +502,7 @@ struct spi_master *spi_busnum_to_master(
> break;
> }
> }
> - up(&spi_master_class.sem);
> + mutex_unlock(&spi_master_class.mutex);
> return master;
> }
> EXPORT_SYMBOL_GPL(spi_busnum_to_master);
>