| Message ID | 1309261269-4363-5-git-send-email-graeme.russ@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
Dear Graeme Russ, In message <1309261269-4363-5-git-send-email-graeme.russ@gmail.com> you wrote: > > Signed-off-by: Graeme Russ <graeme.russ@gmail.com> > --- > drivers/block/mg_disk.c | 2 ++ > drivers/mtd/cfi_flash.c | 4 ++++ > 2 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c > index b74307a..2198017 100644 > --- a/drivers/block/mg_disk.c > +++ b/drivers/block/mg_disk.c > @@ -91,7 +91,9 @@ static unsigned int mg_wait (u32 expect, u32 msec) > u32 from, cur, err; > > err = MG_ERR_NONE; > +#ifdef CONFIG_NIOS2 > reset_timer(); > +#endif I don't think this is a good idea. Instead of making this depend on a specific architecture, we should make it depend on some feature. I. e. please change "#ifdef CONFIG_NIOS2" into some "#ifdef CONFIG_BROKEN_TIMERS" or CONFIG_TERRIBLY_SLOW_CLOCK or the like. Best regards, Wolfgang Denk
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index b74307a..2198017 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c @@ -91,7 +91,9 @@ static unsigned int mg_wait (u32 expect, u32 msec) u32 from, cur, err; err = MG_ERR_NONE; +#ifdef CONFIG_NIOS2 reset_timer(); +#endif from = get_timer(0); status = readb(mg_base() + MG_REG_STATUS); diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c index 6039e1f..3ac6c80 100644 --- a/drivers/mtd/cfi_flash.c +++ b/drivers/mtd/cfi_flash.c @@ -573,7 +573,9 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector, #endif /* Wait for command completion */ +#ifdef CONFIG_NIOS2 reset_timer(); +#endif start = get_timer (0); while (flash_is_busy (info, sector)) { if (get_timer (start) > tout) { @@ -662,7 +664,9 @@ static int flash_status_poll(flash_info_t *info, void *src, void *dst, #endif /* Wait for command completion */ +#ifdef CONFIG_NIOS2 reset_timer(); +#endif start = get_timer(0); while (1) { switch (info->portwidth) {
Signed-off-by: Graeme Russ <graeme.russ@gmail.com> --- drivers/block/mg_disk.c | 2 ++ drivers/mtd/cfi_flash.c | 4 ++++ 2 files changed, 6 insertions(+), 0 deletions(-)