From 45f1a41b2b2e02e91d29bde66a8da4d050959f65 Mon Sep 17 00:00:00 2001 From: Boaz Harrosh Date: Tue, 2 Oct 2007 23:05:53 +0200 Subject: [SCSI] gdth: clean up host private data - Based on same patch from Christoph Hellwig - Get rid of all the indirection in the Scsi_Host private data and always put the gdth_ha_str directly into it. - Change all internal functions prototype to recieve an "gdth_ha_str *ha" pointer directlly and kill all that redundent access to the "gdth_ctr_tab[]" controller-table. Signed-off-by: Boaz Harrosh Signed-off-by: Christoph Hellwig Signed-off-by: James Bottomley --- drivers/scsi/gdth.h | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) (limited to 'drivers/scsi/gdth.h') diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index 68845873cf9d..e8b9eb771d36 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h @@ -853,6 +853,8 @@ typedef struct { /* controller information structure */ typedef struct { + struct Scsi_Host *shost; + ushort hanum; ushort oem_id; /* OEM */ ushort type; /* controller class */ ulong32 stype; /* subtype (PCI: device ID) */ @@ -864,6 +866,7 @@ typedef struct { void __iomem *brd; /* DPRAM address */ ulong32 brd_phys; /* slot number/BIOS address */ gdt6c_plx_regs *plx; /* PLX regs (new PCI contr.) */ + gdth_cmd_str cmdext; gdth_cmd_str *pccb; /* address command structure */ ulong32 ccb_phys; /* phys. address */ #ifdef INT_COAL @@ -937,20 +940,6 @@ typedef struct { struct scsi_device *sdev; } gdth_ha_str; -/* structure for scsi_register(), SCSI bus != 0 */ -typedef struct { - ushort hanum; - ushort busnum; -} gdth_num_str; - -/* structure for scsi_register() */ -typedef struct { - gdth_num_str numext; /* must be the first element */ - gdth_ha_str haext; - gdth_cmd_str cmdext; -} gdth_ext_str; - - /* INQUIRY data format */ typedef struct { unchar type_qual; -- cgit v1.2.3