summaryrefslogtreecommitdiff
path: root/include/scsi.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
committerTom Rini <trini@konsulko.com>2016-12-09 07:56:54 -0500
commit361a879902a3cbdb692149a1ac580e3199e771ba (patch)
tree22d8f65bdf2e41096d13f2bfd458fb25b3c3698d /include/scsi.h
parent3edc0c252257e4afed163a3a74aba24a5509b198 (diff)
downloadu-boot-361a879902a3cbdb692149a1ac580e3199e771ba.tar.gz
Revert "Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze"
This reverts commit 3edc0c252257e4afed163a3a74aba24a5509b198, reversing changes made to bb135a0180c31fbd7456021fb9700b49bba7f533.
Diffstat (limited to 'include/scsi.h')
-rw-r--r--include/scsi.h20
1 files changed, 1 insertions, 19 deletions
diff --git a/include/scsi.h b/include/scsi.h
index 190dacd0f2..c8796785a4 100644
--- a/include/scsi.h
+++ b/include/scsi.h
@@ -166,11 +166,8 @@ typedef struct SCSI_cmd_block{
void scsi_print_error(ccb *pccb);
int scsi_exec(ccb *pccb);
void scsi_bus_reset(void);
-#if !defined(CONFIG_DM_SCSI)
void scsi_low_level_init(int busdevfunc);
-#else
-void scsi_low_level_init(int busdevfunc, struct udevice *dev);
-#endif
+
/***************************************************************************
* functions residing inside cmd_scsi.c
@@ -178,21 +175,6 @@ void scsi_low_level_init(int busdevfunc, struct udevice *dev);
void scsi_init(void);
int scsi_scan(int mode);
-#if defined(CONFIG_DM_SCSI)
-/**
- * struct scsi_platdata - stores information about SCSI controller
- *
- * @base: Controller base address
- * @max_lun: Maximum number of logical units
- * @max_id: Maximum number of target ids
- */
-struct scsi_platdata {
- unsigned long base;
- unsigned long max_lun;
- unsigned long max_id;
-};
-#endif
-
#define SCSI_IDENTIFY 0xC0 /* not used */
/* Hardware errors */