lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] sym53c8xx: Remove io_ws, mmio_ws and ram_ws elements

Browse Source 
These struct elements record info that is never needed

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Matthew Wilcox
2007-10-05 15:55:07 -04:00
committed by James Bottomley
parent e58bc06ed0
commit 8637baa360
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/sym53c8xx_2/sym_glue.c
View File

@@ -1432,17 +1432,14 @@ static struct Scsi_Host * __devinit sym_attach(struct scsi_host_template *tpnt,
np->mmio_ba = (u32)dev->mmio_base; np->mmio_ba = (u32)dev->mmio_base;
np->s.ioaddr = dev->s.ioaddr; np->s.ioaddr = dev->s.ioaddr;
np->s.ramaddr = dev->s.ramaddr; np->s.ramaddr = dev->s.ramaddr;
np->s.io_ws = (np->features & FE_IO256) ? 256 : 128;
/* /*
* Map on-chip RAM if present and supported. * Map on-chip RAM if present and supported.
*/ */
if (!(np->features & FE_RAM)) if (!(np->features & FE_RAM))
dev->ram_base = 0; dev->ram_base = 0;
if (dev->ram_base) { if (dev->ram_base)
np->ram_ba = (u32)dev->ram_base; np->ram_ba = (u32)dev->ram_base;
np->ram_ws = (np->features & FE_RAM8K) ? 8192 : 4096;
}
if (sym_hcb_attach(instance, fw, dev->nvram)) if (sym_hcb_attach(instance, fw, dev->nvram))
goto attach_failed; goto attach_failed;

1
drivers/scsi/sym53c8xx_2/sym_glue.h
View File

@@ -184,7 +184,6 @@ struct sym_shcb {
void __iomem * ioaddr; /* MMIO kernel io address */ void __iomem * ioaddr; /* MMIO kernel io address */
void __iomem * ramaddr; /* RAM kernel io address */ void __iomem * ramaddr; /* RAM kernel io address */
u_short io_ws; /* IO window size */
struct timer_list timer; /* Timer handler link header */ struct timer_list timer; /* Timer handler link header */
u_long lasttime; u_long lasttime;

5
drivers/scsi/sym53c8xx_2/sym_hipd.c
View File

@@ -1910,7 +1910,7 @@ void sym_start_up (struct sym_hcb *np, int reason)
if (sym_verbose >= 2) if (sym_verbose >= 2)
printf("%s: Downloading SCSI SCRIPTS.\n", sym_name(np)); printf("%s: Downloading SCSI SCRIPTS.\n", sym_name(np));
memcpy_toio(np->s.ramaddr, np->scripta0, np->scripta_sz); memcpy_toio(np->s.ramaddr, np->scripta0, np->scripta_sz);
if (np->ram_ws == 8192) { if (np->features & FE_RAM8K) {
memcpy_toio(np->s.ramaddr + 4096, np->scriptb0, np->scriptb_sz); memcpy_toio(np->s.ramaddr + 4096, np->scriptb0, np->scriptb_sz);
phys = scr_to_cpu(np->scr_ram_seg); phys = scr_to_cpu(np->scr_ram_seg);
OUTL(np, nc_mmws, phys); OUTL(np, nc_mmws, phys);
@@ -5597,14 +5597,11 @@ int sym_hcb_attach(struct Scsi_Host *shost, struct sym_fw *fw, struct sym_nvram
if (np->ram_ba) { if (np->ram_ba) {
np->scripta_ba = np->ram_ba; np->scripta_ba = np->ram_ba;
if (np->features & FE_RAM8K) { if (np->features & FE_RAM8K) {
np->ram_ws = 8192;
np->scriptb_ba = np->scripta_ba + 4096; np->scriptb_ba = np->scripta_ba + 4096;
#if 0 /* May get useful for 64 BIT PCI addressing */ #if 0 /* May get useful for 64 BIT PCI addressing */
np->scr_ram_seg = cpu_to_scr(np->scripta_ba >> 32); np->scr_ram_seg = cpu_to_scr(np->scripta_ba >> 32);
#endif #endif
} }
else
np->ram_ws = 4096;
} }
/* /*

3
drivers/scsi/sym53c8xx_2/sym_hipd.h
View File

@@ -883,10 +883,7 @@ struct sym_hcb {
* Physical bus addresses of the chip. * Physical bus addresses of the chip.
*/ */
u32 mmio_ba; /* MMIO 32 bit BUS address */ u32 mmio_ba; /* MMIO 32 bit BUS address */
int mmio_ws; /* MMIO Window size */
u32 ram_ba; /* RAM 32 bit BUS address */ u32 ram_ba; /* RAM 32 bit BUS address */
int ram_ws; /* RAM window size */
/* /*
* SCRIPTS virtual and physical bus addresses. * SCRIPTS virtual and physical bus addresses.