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>

diff --git a/drivers/staging/slicoss/slic.h b/drivers/staging/slicoss/slic.h
index 702902cdb461d67380b5429f0baa88a76c75605e..379c4f7a887503e2abe140da269173f6e422c94a 100644 (file)
--- a/drivers/staging/slicoss/slic.h
+++ b/drivers/staging/slicoss/slic.h
@@ -420,8 +420,6 @@ struct adapter {
        ushort              devid;
        ushort              subsysid;
        u32             irq;
-       void __iomem *memorybase;
-       u32             memorylength;
        u32             drambase;
        u32             dramlength;
        uint                queues_initialized;

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index c6c1c4082d76576a79f6c3d7d36f59a4cbe1a6eb..e8d38cf5a62a34aa862e9f0cb8c781770bd8d9e4 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -3421,7 +3421,6 @@ static void slic_init_adapter(struct net_device *netdev,
        adapter->busnumber = pcidev->bus->number;
        adapter->slotnumber = ((pcidev->devfn >> 3) & 0x1F);
        adapter->functionnumber = (pcidev->devfn & 0x7);
-       adapter->memorylength = pci_resource_len(pcidev, 0);
        adapter->slic_regs = (__iomem struct slic_regs *)memaddr;
        adapter->irq = pcidev->irq;
 /*     adapter->netdev = netdev;*/
@@ -3430,7 +3429,6 @@ static void slic_init_adapter(struct net_device *netdev,
        adapter->chipid = chip_idx;
        adapter->port = 0;      /*adapter->functionnumber;*/
        adapter->cardindex = adapter->port;
-       adapter->memorybase = memaddr;
        spin_lock_init(&adapter->upr_lock.lock);
        spin_lock_init(&adapter->bit64reglock.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);
 
-       netdev->base_addr = (unsigned long)adapter->memorybase;
+       netdev->base_addr = (unsigned long) memmapped_ioaddr;
        netdev->irq = adapter->irq;
        netdev->netdev_ops = &slic_netdev_ops;