block: ide: Drop CONFIG_IDE_LED

This is actually not used. Drop it.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/block/ide.c b/drivers/block/ide.c
index cea0397eb23e4ebbfacb86f4866733fae2912f99..ce51153099bdbc574d522c845e30f076da48f3b6 100644 (file)
--- a/drivers/block/ide.c
+++ b/drivers/block/ide.c
@@ -44,12 +44,6 @@ struct blk_desc ide_dev_desc[CONFIG_SYS_IDE_MAXDEVICE];
 #define CONFIG_SYS_ATA_PORT_ADDR(port) (port)
 #endif
 
-#ifndef CONFIG_IDE_LED /* define LED macros, they are not used anyways */
-# define DEVICE_LED(x) 0
-# define LED_IDE1 1
-# define LED_IDE2 2
-#endif
-
 #ifdef CONFIG_IDE_RESET
 extern void ide_set_reset(int idereset);
 
@@ -217,8 +211,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
        unsigned char c, err, mask, res;
        int n;
 
-       ide_led(DEVICE_LED(device), 1); /* LED on       */
-
        /* Select device
         */
        mask = ATA_STAT_BUSY | ATA_STAT_DRQ;
@@ -326,7 +318,6 @@ unsigned char atapi_issue(int device, unsigned char *ccb, int ccblen,
                err = 0;
        }
 AI_OUT:
-       ide_led(DEVICE_LED(device), 0); /* LED off      */
        return err;
 }
 
@@ -560,7 +551,6 @@ static void ide_ident(struct blk_desc *dev_desc)
        device = dev_desc->devnum;
        printf("  Device %d: ", device);
 
-       ide_led(DEVICE_LED(device), 1); /* LED on       */
        /* Select device
         */
        ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
@@ -600,7 +590,6 @@ static void ide_ident(struct blk_desc *dev_desc)
                         */
                        c = ide_wait(device, IDE_TIME_OUT);
                }
-               ide_led(DEVICE_LED(device), 0); /* LED off      */
 
                if (((c & ATA_STAT_DRQ) == 0) ||
                    ((c & (ATA_STAT_FAULT | ATA_STAT_ERR)) != 0)) {
@@ -716,22 +705,6 @@ static void ide_ident(struct blk_desc *dev_desc)
 #endif
 }
 
-__weak void ide_led(uchar led, uchar status)
-{
-#if defined(CONFIG_IDE_LED) && defined(PER8_BASE) /* required by LED_PORT */
-       static uchar led_buffer;        /* Buffer for current LED status */
-
-       uchar *led_port = LED_PORT;
-
-       if (status)             /* switch LED on        */
-               led_buffer |= led;
-       else                    /* switch LED off       */
-               led_buffer &= ~led;
-
-       *led_port = led_buffer;
-#endif
-}
-
 __weak void ide_outb(int dev, int port, unsigned char val)
 {
        debug("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n",
@@ -783,12 +756,6 @@ void ide_init(void)
 
        WATCHDOG_RESET();
 
-       /*
-        * Reset the IDE just to be sure.
-        * Light LED's to show
-        */
-       ide_led((LED_IDE1 | LED_IDE2), 1);      /* LED's on     */
-
        /* ATAPI Drives seems to need a proper IDE Reset */
        ide_reset();
 
@@ -818,8 +785,6 @@ void ide_init(void)
                        i++;
                        if (i > (ATA_RESET_TIME * 100)) {
                                puts("** Timeout **\n");
-                               /* LED's off */
-                               ide_led((LED_IDE1 | LED_IDE2), 0);
                                return;
                        }
                        if ((i >= 100) && ((i % 100) == 0))
@@ -844,10 +809,7 @@ void ide_init(void)
 
        putc('\n');
 
-       ide_led((LED_IDE1 | LED_IDE2), 0);      /* LED's off    */
-
        for (i = 0; i < CONFIG_SYS_IDE_MAXDEVICE; ++i) {
-               int led = (IDE_BUS(i) == 0) ? LED_IDE1 : LED_IDE2;
                ide_dev_desc[i].type = DEV_TYPE_UNKNOWN;
                ide_dev_desc[i].if_type = IF_TYPE_IDE;
                ide_dev_desc[i].devnum = i;
@@ -862,9 +824,7 @@ void ide_init(void)
 #endif
                if (!ide_bus_ok[IDE_BUS(i)])
                        continue;
-               ide_led(led, 1);        /* LED on       */
                ide_ident(&ide_dev_desc[i]);
-               ide_led(led, 0);        /* LED off      */
                dev_print(&ide_dev_desc[i]);
 
                if ((ide_dev_desc[i].lba > 0) && (ide_dev_desc[i].blksz > 0)) {
@@ -987,8 +947,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
        debug("ide_read dev %d start " LBAF ", blocks " LBAF " buffer at %lX\n",
              device, blknr, blkcnt, (ulong) buffer);
 
-       ide_led(DEVICE_LED(device), 1); /* LED on       */
-
        /* Select device
         */
        ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
@@ -1086,7 +1044,6 @@ ulong ide_read(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
                buffer += ATA_BLOCKSIZE;
        }
 IDE_READ_E:
-       ide_led(DEVICE_LED(device), 0); /* LED off      */
        return n;
 }
 
@@ -1114,8 +1071,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
        }
 #endif
 
-       ide_led(DEVICE_LED(device), 1); /* LED on       */
-
        /* Select device
         */
        ide_outb(device, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(device));
@@ -1179,7 +1134,6 @@ ulong ide_write(struct blk_desc *block_dev, lbaint_t blknr, lbaint_t blkcnt,
                buffer += ATA_BLOCKSIZE;
        }
 WR_OUT:
-       ide_led(DEVICE_LED(device), 0); /* LED off      */
        return n;
 }
 

diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h
index b0707143c267619785f43348eba688437028f6d8..1f0c11c310a3f53e4711af5f3de80264e1bd307a 100644 (file)
--- a/include/configs/dbau1x00.h
+++ b/include/configs/dbau1x00.h
@@ -159,7 +159,6 @@
 #define CONFIG_SYS_IDE_MAXBUS          1       /* max. 1 IDE bus               */
 #define CONFIG_SYS_IDE_MAXDEVICE       1       /* max. 1 drive per IDE bus     */
 
-#undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
 #undef CONFIG_IDE_RESET                /* reset for ide not supported  */
 
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0x0000

diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h
index 7cbbe876b2b3133998cdaa0a7d43949356338bb4..5d5851f5168a5f031176d303cbc2da15318f0108 100644 (file)
--- a/include/configs/lsxl.h
+++ b/include/configs/lsxl.h
@@ -142,7 +142,6 @@
 #endif /* CONFIG_CMD_NET */
 
 #ifdef CONFIG_IDE
-#undef CONFIG_IDE_LED
 #undef CONFIG_SYS_IDE_MAXBUS
 #define CONFIG_SYS_IDE_MAXBUS          1
 #undef CONFIG_SYS_IDE_MAXDEVICE

diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h
index a9092d4b6d2e3e5895c4b9dabe2555c92aed2cb3..f6816ddb040e9009b2e9132e4a887310918d6faf 100644 (file)
--- a/include/configs/pb1x00.h
+++ b/include/configs/pb1x00.h
@@ -112,7 +112,6 @@
 #define CONFIG_SYS_IDE_MAXBUS          1       /* max. 1 IDE bus               */
 #define CONFIG_SYS_IDE_MAXDEVICE       1       /* max. 1 drive per IDE bus     */
 
-#undef CONFIG_IDE_LED                  /* LED   for ide not supported  */
 #undef CONFIG_IDE_RESET                /* reset for ide not supported  */
 
 #define CONFIG_SYS_ATA_IDE0_OFFSET     0x0000

diff --git a/include/ide.h b/include/ide.h
index a4be763804cd4a431d33abad9f28e7d46c3aeed9..4d788912f2a5105d7bf99c9ce7ee624b590710a5 100644 (file)
--- a/include/ide.h
+++ b/include/ide.h
@@ -15,19 +15,6 @@
 #define        ATA_CURR_BASE(dev)      (CONFIG_SYS_ATA_BASE_ADDR+ide_bus_offset[IDE_BUS(dev)])
 extern ulong ide_bus_offset[];
 
-#ifdef CONFIG_IDE_LED
-
-/*
- * LED Port
- */
-#define        LED_PORT        ((uchar *)(PER8_BASE + 0x3000))
-#define LED_IDE1       0x01
-#define LED_IDE2       0x02
-#define        DEVICE_LED(d)   ((d & 2) | ((d & 2) == 0)) /* depends on bit positions! */
-
-void ide_led(uchar led, uchar status);
-#endif /* CONFIG_IDE_LED */
-
 /*
  * Function Prototypes
  */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 440f7403cd3c97818874fcc593f5371b985dd719..2aa23dc819d4aea4910834d589c14eb621f1d698 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1080,7 +1080,6 @@ CONFIG_I2C_RTC_ADDR
 CONFIG_I2C_TIMEOUT
 CONFIG_ICACHE
 CONFIG_ICS307_REFCLK_HZ
-CONFIG_IDE_LED
 CONFIG_IDE_PCMCIA
 CONFIG_IDE_PREINIT
 CONFIG_IDE_REG_CS