From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp122.sbc.mail.sp1.yahoo.com ([69.147.64.95]) by canuck.infradead.org with smtp (Exim 4.63 #1 (Red Hat Linux)) id 1I2bYi-0004b7-0P for linux-mtd@lists.infradead.org; Sun, 24 Jun 2007 19:31:59 -0400 From: David Brownell To: linux-mtd@lists.infradead.org Subject: [patch 2.6.22-rc3] MTD: m25p80 converted to mutex MIME-Version: 1.0 Content-Disposition: inline Date: Sun, 24 Jun 2007 15:09:13 -0700 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <200706241509.14367.david-b@pacbell.net> List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Convert semaphore usage in m25p80 driver to mutex; mention another kind of SPI flash chip that should be able to use this driver (given minor tweaks). Signed-off-by: David Brownell --- [RESEND -- original was on 25-May, was neither merged nor acked ] drivers/mtd/devices/m25p80.c | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) --- g26.orig/drivers/mtd/devices/m25p80.c 2007-05-24 02:02:35.000000000 -0700 +++ g26/drivers/mtd/devices/m25p80.c 2007-05-24 02:11:48.000000000 -0700 @@ -19,16 +19,17 @@ #include #include #include -#include +#include + #include #include + #include #include -#include - /* NOTE: AT 25F and SST 25LF series are very similar, + * as are other newer Atmel dataflash chips (AT26), * but commands for sector erase and chip id differ... */ @@ -65,7 +66,7 @@ struct m25p { struct spi_device *spi; - struct semaphore lock; + struct mutex lock; struct mtd_info mtd; unsigned partitioned; u8 command[4]; @@ -201,13 +202,13 @@ static int m25p80_erase(struct mtd_info addr = instr->addr; len = instr->len; - down(&flash->lock); + mutex_lock(&flash->lock); /* now erase those sectors */ while (len) { if (erase_sector(flash, addr)) { instr->state = MTD_ERASE_FAILED; - up(&flash->lock); + mutex_unlock(&flash->lock); return -EIO; } @@ -215,7 +216,7 @@ static int m25p80_erase(struct mtd_info len -= mtd->erasesize; } - up(&flash->lock); + mutex_unlock(&flash->lock); instr->state = MTD_ERASE_DONE; mtd_erase_callback(instr); @@ -260,12 +261,12 @@ static int m25p80_read(struct mtd_info * if (retlen) *retlen = 0; - down(&flash->lock); + mutex_lock(&flash->lock); /* Wait till previous write/erase is done. */ if (wait_till_ready(flash)) { /* REVISIT status return?? */ - up(&flash->lock); + mutex_unlock(&flash->lock); return 1; } @@ -281,7 +282,7 @@ static int m25p80_read(struct mtd_info * *retlen = m.actual_length - sizeof(flash->command); - up(&flash->lock); + mutex_unlock(&flash->lock); return 0; } @@ -323,7 +324,7 @@ static int m25p80_write(struct mtd_info t[1].tx_buf = buf; spi_message_add_tail(&t[1], &m); - down(&flash->lock); + mutex_lock(&flash->lock); /* Wait until finished previous write command. */ if (wait_till_ready(flash)) @@ -381,10 +382,10 @@ static int m25p80_write(struct mtd_info if (retlen) *retlen += m.actual_length - sizeof(flash->command); - } - } + } + } - up(&flash->lock); + mutex_unlock(&flash->lock); return 0; } @@ -405,7 +406,7 @@ struct flash_info { }; static struct flash_info __devinitdata m25p_data [] = { - /* REVISIT: fill in JEDEC ids, for parts that have them */ + /* JEDEC id zero means "has no ID" */ { "m25p05", 0x05, 0x2010, 32 * 1024, 2 }, { "m25p10", 0x10, 0x2011, 32 * 1024, 4 }, { "m25p20", 0x11, 0x2012, 64 * 1024, 4 }, @@ -456,7 +457,7 @@ static int __devinit m25p_probe(struct s return -ENOMEM; flash->spi = spi; - init_MUTEX(&flash->lock); + mutex_init(&flash->lock); dev_set_drvdata(&spi->dev, flash); if (data->name)