From 114476b0d2d265eb7693be7cf08fa3b2d51d3b8d Mon Sep 17 00:00:00 2001
From: Bryan Wu <bryan.wu@canonical.com>
Date: Mon, 26 Mar 2012 18:56:08 +0800
Subject: [PATCH] --- yaml --- r: 326983 b: refs/heads/master c:
 51891a431354d0b6d0408746f398364b15068d65 h: refs/heads/master i:   326981:
 e9fe1252b6516dfdd7ded04ae4d0eeff667555dd   326979:
 6369dfffe7c8f8b264359cdd1afc739d7c857553   326975:
 0834ee469057ca87d132bc150b3791d8d9c122c8 v: v3

---
 [refs]                       |  2 +-
 trunk/drivers/char/nwflash.c | 34 ----------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index 8c29b2d60c27..1169dfe5bd73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf6856d693dd6bd1b9c967e3a97b7ca2184a3e95
+refs/heads/master: 51891a431354d0b6d0408746f398364b15068d65
diff --git a/trunk/drivers/char/nwflash.c b/trunk/drivers/char/nwflash.c
index d45c3345b4af..a0e2f7d70355 100644
--- a/trunk/drivers/char/nwflash.c
+++ b/trunk/drivers/char/nwflash.c
@@ -30,7 +30,6 @@
 
 #include <asm/hardware/dec21285.h>
 #include <asm/io.h>
-#include <asm/leds.h>
 #include <asm/mach-types.h>
 #include <asm/uaccess.h>
 
@@ -179,9 +178,6 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
 
 	written = 0;
 
-	leds_event(led_claim);
-	leds_event(led_green_on);
-
 	nBlock = (int) p >> 16;	//block # of 64K bytes
 
 	/*
@@ -258,11 +254,6 @@ static ssize_t flash_write(struct file *file, const char __user *buf,
 			printk(KERN_DEBUG "flash_write: written 0x%X bytes OK.\n", written);
 	}
 
-	/*
-	 * restore reg on exit
-	 */
-	leds_event(led_release);
-
 	mutex_unlock(&nwflash_mutex);
 
 	return written;
@@ -333,11 +324,6 @@ static int erase_block(int nBlock)
 	unsigned long timeout;
 	int temp, temp1;
 
-	/*
-	 * orange LED == erase
-	 */
-	leds_event(led_amber_on);
-
 	/*
 	 * reset footbridge to the correct offset 0 (...0..3)
 	 */
@@ -446,12 +432,6 @@ static int write_block(unsigned long p, const char __user *buf, int count)
 	unsigned long timeout;
 	unsigned long timeout1;
 
-	/*
-	 * red LED == write
-	 */
-	leds_event(led_amber_off);
-	leds_event(led_red_on);
-
 	pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));
 
 	/*
@@ -557,18 +537,10 @@ static int write_block(unsigned long p, const char __user *buf, int count)
 					printk(KERN_DEBUG "write_block: Retrying write at 0x%X)n",
 					       pWritePtr - FLASH_BASE);
 
-				/*
-				 * no LED == waiting
-				 */
-				leds_event(led_amber_off);
 				/*
 				 * wait couple ms
 				 */
 				msleep(10);
-				/*
-				 * red LED == write
-				 */
-				leds_event(led_red_on);
 
 				goto WriteRetry;
 			} else {
@@ -583,12 +555,6 @@ static int write_block(unsigned long p, const char __user *buf, int count)
 		}
 	}
 
-	/*
-	 * green LED == read/verify
-	 */
-	leds_event(led_amber_off);
-	leds_event(led_green_on);
-
 	msleep(10);
 
 	pWritePtr = (unsigned char *) ((unsigned int) (FLASH_BASE + p));