diff options
Diffstat (limited to 'linux/src/drivers')
-rw-r--r-- | linux/src/drivers/net/8390.c | 3 | ||||
-rw-r--r-- | linux/src/drivers/scsi/gdth.c | 5 | ||||
-rw-r--r-- | linux/src/drivers/scsi/ppa.c | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/linux/src/drivers/net/8390.c b/linux/src/drivers/net/8390.c index 9864106..93c485d 100644 --- a/linux/src/drivers/net/8390.c +++ b/linux/src/drivers/net/8390.c @@ -706,13 +706,10 @@ int ethdev_init(struct device *dev) printk(version); if (dev->priv == NULL) { - struct ei_device *ei_local; - dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL); if (dev->priv == NULL) return -ENOMEM; memset(dev->priv, 0, sizeof(struct ei_device)); - ei_local = (struct ei_device *)dev->priv; } dev->hard_start_xmit = &ei_start_xmit; diff --git a/linux/src/drivers/scsi/gdth.c b/linux/src/drivers/scsi/gdth.c index 6cc2b78..0a4bef8 100644 --- a/linux/src/drivers/scsi/gdth.c +++ b/linux/src/drivers/scsi/gdth.c @@ -2851,8 +2851,9 @@ __initfunc (int gdth_detect(Scsi_Host_Template *shtp)) ushort eisa_slot,device_id,index; gdth_pci_str pcistr; int i,j,hanum; +#if LINUX_VERSION_CODE < 0x020000 unchar b; - +#endif #ifdef DEBUG_GDTH printk("GDT: This driver contains debugging information !! Trace level = %d\n", @@ -2878,7 +2879,7 @@ __initfunc (int gdth_detect(Scsi_Host_Template *shtp)) } /* initializations */ - gdth_polling = TRUE; b = 0; + gdth_polling = TRUE; for (i=0; i<GDTH_MAXCMDS; ++i) for (j=0; j<MAXHA; ++j) gdth_cmd_tab[i][j].cmnd = UNUSED_CMND; diff --git a/linux/src/drivers/scsi/ppa.c b/linux/src/drivers/scsi/ppa.c index 5063a67..fd224f9 100644 --- a/linux/src/drivers/scsi/ppa.c +++ b/linux/src/drivers/scsi/ppa.c @@ -259,7 +259,6 @@ int ppa_detect(Scsi_Host_Template * host) struct Scsi_Host *hreg; int ports; int i, nhosts; - unsigned short ppb; printk("ppa: Version %s\n", PPA_VERSION); nhosts = 0; @@ -267,7 +266,7 @@ int ppa_detect(Scsi_Host_Template * host) for (i = 0; i < parbus_no; i++) { if (parbus_base[i] == 0x0000) continue; - ppb = ppa_hosts[i].base = parbus_base[i]; + ppa_hosts[i].base = parbus_base[i]; /* sanity checks */ if (check_region(parbus_base[i], @@ -518,7 +517,7 @@ static inline int ppa_byte_in(unsigned short base, char *buffer, int len) " shrb $4,%%al\n" \ " orb %%al," #reg "\n" -static inline int ppa_nibble_in(unsigned short str_p, char *buffer, int len) +static inline int ppa_nibble_in(unsigned short base, char *buffer, int len) { for (; len; len--) { unsigned char h; |