git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
nwflash.c
diff --git
a/drivers/char/nwflash.c
b/drivers/char/nwflash.c
index
e75381e
..
62c67cd
100644
(file)
--- a/
drivers/char/nwflash.c
+++ b/
drivers/char/nwflash.c
@@
-60,15
+60,6
@@
static DECLARE_MUTEX(nwflash_sem);
extern spinlock_t gpio_lock;
extern spinlock_t gpio_lock;
-/*
- * the delay routine - it is often required to let the flash "breeze"...
- */
-void flash_wait(int timeout)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(timeout);
-}
-
static int get_flash_id(void)
{
volatile unsigned int c1, c2;
static int get_flash_id(void)
{
volatile unsigned int c1, c2;
@@
-401,7
+392,7
@@
static int erase_block(int nBlock)
/*
* wait 10 ms
*/
/*
* wait 10 ms
*/
-
flash_wait(HZ / 10
0);
+
msleep(1
0);
/*
* wait while erasing in process (up to 10 sec)
/*
* wait while erasing in process (up to 10 sec)
@@
-409,7
+400,7
@@
static int erase_block(int nBlock)
timeout = jiffies + 10 * HZ;
c1 = 0;
while (!(c1 & 0x80) && time_before(jiffies, timeout)) {
timeout = jiffies + 10 * HZ;
c1 = 0;
while (!(c1 & 0x80) && time_before(jiffies, timeout)) {
-
flash_wait(HZ / 10
0);
+
msleep(1
0);
/*
* read any address
*/
/*
* read any address
*/
@@
-440,7
+431,7
@@
static int erase_block(int nBlock)
/*
* just to make sure - verify if erased OK...
*/
/*
* just to make sure - verify if erased OK...
*/
-
flash_wait(HZ / 10
0);
+
msleep(1
0);
pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + (nBlock << 16)));
pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + (nBlock << 16)));
@@
-587,7
+578,7
@@
static int write_block(unsigned long p, const char __user *buf, int count)
/*
* wait couple ms
*/
/*
* wait couple ms
*/
-
flash_wait(HZ / 10
0);
+
msleep(1
0);
/*
* red LED == write
*/
/*
* red LED == write
*/
@@
-612,7
+603,7
@@
static int write_block(unsigned long p, const char __user *buf, int count)
leds_event(led_amber_off);
leds_event(led_green_on);
leds_event(led_amber_off);
leds_event(led_green_on);
-
flash_wait(HZ / 10
0);
+
msleep(1
0);
pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));
pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));
@@
-705,7
+696,7
@@
static void __exit nwflash_exit(void)
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
-
MODULE_PARM(flashdebug, "i"
);
+
module_param(flashdebug, bool, 0644
);
module_init(nwflash_init);
module_exit(nwflash_exit);
module_init(nwflash_init);
module_exit(nwflash_exit);