Two patches for my xD support [RESEND]
Subsystems (2)
Hi,
These are two small patches, one to fix a mistake which should be harmless, but still a mistake, and the other one small cosmetic refactoring.
David Woodhouse, can you queue that to 2.6.36?
Best regards,
Maxim Levitsky
PATCH 1/2 MTD: r852: remove useless pci powerup/down from suspend/resume routines.
It turns out that pci core now handles these, so this code is redundand and can even cause bugs
Signed-off-by Maxim Levitsky <[email protected]>
--- drivers/mtd/nand/r852.c | 30 +----------------------------- drivers/mtd/nand/r852.h | 2 -- 2 files changed, 1 insertions(+), 31 deletions(-)
drivers/mtd/nand/r852.c +1 -29
@@ -757,11 +757,6 @@ static irqreturn_t r852_irq(int irq, void *data)spin_lock_irqsave (&dev->irqlock, flags); -/* We can recieve shared interrupt while pci is suspended -in that case reads will return 0xFFFFFFFF.... */ -if (dev->insuspend) - goto out; -/* handle card detection interrupts first */ card_status =r852_read_reg (dev,R852_CARD_IRQ_STA );r852_write_reg (dev,R852_CARD_IRQ_STA , card_status);
@@ -1035,7 +1030,6 @@ void r852_shutdown(struct pci_dev *pci_dev)int r852_suspend (struct device *device) {struct r852_device *dev =pci_get_drvdata (to_pci_dev (device)); -unsigned long flags;if (dev->ctlreg &R852_CTL_CARDENABLE )return -EBUSY ;
@@ -1047,43 +1041,22 @@ int r852_suspend(struct device *device)r852_disable_irqs (dev);r852_engine_disable (dev); -spin_lock_irqsave (&dev->irqlock, flags); - dev->insuspend =1 ; -spin_unlock_irqrestore (&dev->irqlock, flags); - -/* At that point, even if interrupt handler is running, it will quit */ -/* So wait for this to happen explictly */ -synchronize_irq (dev->irq); -/* If card was pulled off just during the suspend, which is very unlikely, we will remove it on resume, it too late now anyway... */ dev->card_unstable =0 ; - -pci_save_state (to_pci_dev (device)); -return pci_prepare_to_sleep (to_pci_dev (device)); +return 0 ; }int r852_resume (struct device *device) {struct r852_device *dev =pci_get_drvdata (to_pci_dev (device)); -unsigned long flags; - -/* Turn on the hardware */ -pci_back_from_sleep (to_pci_dev (device)); -pci_restore_state (to_pci_dev (device));r852_disable_irqs (dev);r852_card_update_present (dev);r852_engine_disable (dev); -/* Now its safe for IRQ to run */ -spin_lock_irqsave (&dev->irqlock, flags); - dev->insuspend =0 ; -spin_unlock_irqrestore (&dev->irqlock, flags); - -/* If card status changed, just do the work */ if (dev->card_detected != dev->card_registred) { dbg("card was %s during low power state",
@@ -1121,7 +1094,6 @@ MODULE_DEVICE_TABLE(pci, r852_pci_id_tbl);SIMPLE_DEV_PM_OPS (r852_pm_ops, r852_suspend, r852_resume); -static struct pci_driver r852_pci_driver = { .name =DRV_NAME , .id_table = r852_pci_id_tbl,
drivers/mtd/nand/r852.h +0 -2
@@ -140,8 +140,6 @@ struct r852_device {/* interrupt handling */ spinlock_t irqlock;/* IRQ protecting lock */ int irq;/* irq num */ -int insuspend;/* device is suspended */ -/* misc */ void *tmp_buffer;/* temporary buffer */ uint8_t ctlreg;/* cached contents of control reg */
Signature · 1 line
1.7.0.4
PATCH 2/2 mtd: sm_ftl: cosmetic, use bool when possible
In reply to Maxim LevitskyI didn't know that kernel allows use of that typedef.
Signed-off-by Maxim Levitsky <[email protected]>
--- drivers/mtd/sm_ftl.h | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/mtd/sm_ftl.h +4 -4
@@ -20,7 +20,7 @@struct ftl_zone { -int initialized; +bool initialized;int16_t *lba_to_phys_table;/* LBA to physical table */ struct kfifo free_sectors;/* queue of free sectors */ };
@@ -37,8 +37,8 @@ struct sm_ftl {int zone_count;/* number of zones */ int max_lba;/* maximum lba in a zone */ int smallpagenand;/* 256 bytes/page nand */ -int readonly;/* is FS readonly */ -int unstable; +bool readonly;/* is FS readonly */ +bool unstable;int cis_block;/* CIS block location */ int cis_boffset;/* CIS offset in the block */ int cis_page_offset;/* CIS offset in the page */
@@ -49,7 +49,7 @@ struct sm_ftl {int cache_zone;/* zone of cached block */ unsigned char *cache_data;/* cached block data */ long unsigned int cache_data_invalid_bitmap; -int cache_clean; +bool cache_clean;struct work_struct flush_work;struct timer_list timer;
Signature · 1 line
1.7.0.4