scsi: Remove completely unused functions

These functions are not called for any location.
This patch removes them scsi_trim_trail(), scsi_get_disk_count()
and scsi_setup_read6().

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/common/scsi.c b/common/scsi.c
index 9e4ef54..60281f8 100644 (file)
--- a/common/scsi.c
+++ b/common/scsi.c
@@ -119,22 +119,6 @@ void scsi_setup_write_ext(ccb *pccb, lbaint_t start, unsigned short blocks)
              pccb->cmd[7], pccb->cmd[8]);
 }
 
-void scsi_setup_read6(ccb *pccb, lbaint_t start, unsigned short blocks)
-{
-       pccb->cmd[0] = SCSI_READ6;
-       pccb->cmd[1] = pccb->lun << 5 | ((unsigned char)(start >> 16) & 0x1f);
-       pccb->cmd[2] = (unsigned char)(start >> 8) & 0xff;
-       pccb->cmd[3] = (unsigned char)start & 0xff;
-       pccb->cmd[4] = (unsigned char)blocks & 0xff;
-       pccb->cmd[5] = 0;
-       pccb->cmdlen = 6;
-       pccb->msgout[0] = SCSI_IDENTIFY; /* NOT USED */
-       debug("scsi_setup_read6: cmd: %02X %02X startblk %02X%02X blccnt %02X\n",
-             pccb->cmd[0], pccb->cmd[1],
-             pccb->cmd[2], pccb->cmd[3], pccb->cmd[4]);
-}
-
-
 void scsi_setup_inquiry(ccb *pccb)
 {
        pccb->cmd[0] = SCSI_INQUIRY;
@@ -277,11 +261,6 @@ static ulong scsi_write(struct blk_desc *block_dev, lbaint_t blknr,
        return blkcnt;
 }
 
-int scsi_get_disk_count(void)
-{
-       return scsi_max_devs;
-}
-
 #if defined(CONFIG_PCI) && !defined(CONFIG_SCSI_AHCI_PLAT)
 void scsi_init(void)
 {
@@ -363,20 +342,6 @@ void scsi_ident_cpy(unsigned char *dest, unsigned char *src, unsigned int len)
        *dest = '\0';
 }
 
-
-/* Trim trailing blanks, and NUL-terminate string
- */
-void scsi_trim_trail(unsigned char *str, unsigned int len)
-{
-       unsigned char *p = str + len - 1;
-
-       while (len-- > 0) {
-               *p-- = '\0';
-               if (*p != ' ')
-                       return;
-       }
-}
-
 int scsi_read_capacity(ccb *pccb, lbaint_t *capacity, unsigned long *blksz)
 {
        *capacity = 0;

diff --git a/include/scsi.h b/include/scsi.h
index 7e37591..eed8ff9 100644 (file)
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -175,9 +175,6 @@ void scsi_low_level_init(int busdevfunc);
 void scsi_init(void);
 void scsi_scan(int mode);
 
-/** @return the number of scsi disks */
-int scsi_get_disk_count(void);
-
 #define SCSI_IDENTIFY                                  0xC0  /* not used */
 
 /* Hardware errors  */