staging: slicoss: remove unused members of struct adapter
This patch removes two fields from the private "struct adapter". Specifically, memorybase duplicate of slic_regs memorylength written once and never read. This field is trivially computed with pci_resource_len if it's ever needed in the future. Signed-off-by: David Matlack <dmatlack@google.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
a286e34de0
commit
563dce372f
|
@ -420,8 +420,6 @@ struct adapter {
|
||||||
ushort devid;
|
ushort devid;
|
||||||
ushort subsysid;
|
ushort subsysid;
|
||||||
u32 irq;
|
u32 irq;
|
||||||
void __iomem *memorybase;
|
|
||||||
u32 memorylength;
|
|
||||||
u32 drambase;
|
u32 drambase;
|
||||||
u32 dramlength;
|
u32 dramlength;
|
||||||
uint queues_initialized;
|
uint queues_initialized;
|
||||||
|
|
|
@ -3421,7 +3421,6 @@ static void slic_init_adapter(struct net_device *netdev,
|
||||||
adapter->busnumber = pcidev->bus->number;
|
adapter->busnumber = pcidev->bus->number;
|
||||||
adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F);
|
adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F);
|
||||||
adapter->functionnumber = (pcidev->devfn & 0x7);
|
adapter->functionnumber = (pcidev->devfn & 0x7);
|
||||||
adapter->memorylength = pci_resource_len(pcidev, 0);
|
|
||||||
adapter->slic_regs = (__iomem struct slic_regs *)memaddr;
|
adapter->slic_regs = (__iomem struct slic_regs *)memaddr;
|
||||||
adapter->irq = pcidev->irq;
|
adapter->irq = pcidev->irq;
|
||||||
/* adapter->netdev = netdev;*/
|
/* adapter->netdev = netdev;*/
|
||||||
|
@ -3430,7 +3429,6 @@ static void slic_init_adapter(struct net_device *netdev,
|
||||||
adapter->chipid = chip_idx;
|
adapter->chipid = chip_idx;
|
||||||
adapter->port = 0; /*adapter->functionnumber;*/
|
adapter->port = 0; /*adapter->functionnumber;*/
|
||||||
adapter->cardindex = adapter->port;
|
adapter->cardindex = adapter->port;
|
||||||
adapter->memorybase = memaddr;
|
|
||||||
spin_lock_init(&adapter->upr_lock.lock);
|
spin_lock_init(&adapter->upr_lock.lock);
|
||||||
spin_lock_init(&adapter->bit64reglock.lock);
|
spin_lock_init(&adapter->bit64reglock.lock);
|
||||||
spin_lock_init(&adapter->adapter_lock.lock);
|
spin_lock_init(&adapter->adapter_lock.lock);
|
||||||
|
@ -3682,7 +3680,7 @@ static int slic_entry_probe(struct pci_dev *pcidev,
|
||||||
|
|
||||||
slic_adapter_set_hwaddr(adapter);
|
slic_adapter_set_hwaddr(adapter);
|
||||||
|
|
||||||
netdev->base_addr = (unsigned long)adapter->memorybase;
|
netdev->base_addr = (unsigned long) memmapped_ioaddr;
|
||||||
netdev->irq = adapter->irq;
|
netdev->irq = adapter->irq;
|
||||||
netdev->netdev_ops = &slic_netdev_ops;
|
netdev->netdev_ops = &slic_netdev_ops;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue