summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-06-15 03:28:23 (GMT)
committerSimon Glass <sjg@chromium.org>2017-07-11 16:08:19 (GMT)
commita6fb185c70d8ac455ed16d3bae23c3727db07116 (patch)
treeda561577998fc6ab82be60f43ae79d6271f557d9
parentb8beb6b463676f586a5481993590cd8a6e8c5855 (diff)
downloadu-boot-a6fb185c70d8ac455ed16d3bae23c3727db07116.tar.xz
scsi: Drop scsi_print_error()
This function is only defined by one driver and is empty. Move it into the SCSI implementation itself. We could remove it, but it should be useful for debugging. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
-rw-r--r--common/scsi.c5
-rw-r--r--drivers/block/ahci.c5
-rw-r--r--drivers/block/sandbox_scsi.c4
-rw-r--r--include/scsi.h1
4 files changed, 5 insertions, 10 deletions
diff --git a/common/scsi.c b/common/scsi.c
index 4896fb9..6175e50 100644
--- a/common/scsi.c
+++ b/common/scsi.c
@@ -48,6 +48,11 @@ static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
#define SCSI_MAX_READ_BLK 0xFFFF
#define SCSI_LBA48_READ 0xFFFFFFF
+static void scsi_print_error(ccb *pccb)
+{
+ /* Dummy function that could print an error for debugging */
+}
+
#ifdef CONFIG_SYS_64BIT_LBA
void scsi_setup_read16(ccb *pccb, lbaint_t start, unsigned long blocks)
{
diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c
index 3fa14a7..f474471 100644
--- a/drivers/block/ahci.c
+++ b/drivers/block/ahci.c
@@ -1092,8 +1092,3 @@ __weak void scsi_bus_reset(void)
{
/*Not implement*/
}
-
-void scsi_print_error(ccb * pccb)
-{
- /*The ahci error info can be read in the ahci driver*/
-}
diff --git a/drivers/block/sandbox_scsi.c b/drivers/block/sandbox_scsi.c
index ad961bd..f4004a3 100644
--- a/drivers/block/sandbox_scsi.c
+++ b/drivers/block/sandbox_scsi.c
@@ -23,7 +23,3 @@ int scsi_exec(ccb *pccb)
{
return 0;
}
-
-void scsi_print_error(ccb *pccb)
-{
-}
diff --git a/include/scsi.h b/include/scsi.h
index 190dacd..621d938 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -163,7 +163,6 @@ typedef struct SCSI_cmd_block{
* decleration of functions which have to reside in the LowLevel Part Driver
*/
-void scsi_print_error(ccb *pccb);
int scsi_exec(ccb *pccb);
void scsi_bus_reset(void);
#if !defined(CONFIG_DM_SCSI)