From: Malcolm Priestley <tvboxspy@gmail.com>
Date: Sat, 12 Sep 2015 18:10:34 +0000 (+0100)
Subject: staging: vt6655: device_get_pci_info remove unused pci_read_config_*
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=7a95f96108efc94cd79d46245a70c3b5bf9c0840;p=linux.git
staging: vt6655: device_get_pci_info remove unused pci_read_config_*
These values are read from pci but never used.
Removing variables byRevId, SubSystemID, SubVendorID and pci_cmd.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index f020bb1522e00..271a719fe7ddd 100644
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -231,10 +231,7 @@ struct vnt_private {
u32 memaddr;
u32 ioaddr;
- unsigned char byRevId;
unsigned char byRxMode;
- unsigned short SubSystemID;
- unsigned short SubVendorID;
spinlock_t lock;
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index ce2df3747faa0..1e660ccf200f0 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -230,9 +230,6 @@ static void device_init_registers(struct vnt_private *pDevice)
pDevice->byTopOFDMBasicRate = RATE_24M;
pDevice->byTopCCKBasicRate = RATE_1M;
- /* Target to IF pin while programming to RF chip. */
- pDevice->byRevId = 0;
-
/* init MAC */
MACvInitialize(pDevice->PortOffset);
@@ -436,15 +433,9 @@ static void device_print_info(struct vnt_private *pDevice)
static bool device_get_pci_info(struct vnt_private *pDevice,
struct pci_dev *pcid)
{
- u16 pci_cmd;
u8 b;
unsigned int cis_addr;
- pci_read_config_byte(pcid, PCI_REVISION_ID, &pDevice->byRevId);
- pci_read_config_word(pcid, PCI_SUBSYSTEM_ID, &pDevice->SubSystemID);
- pci_read_config_word(pcid, PCI_SUBSYSTEM_VENDOR_ID, &pDevice->SubVendorID);
- pci_read_config_word(pcid, PCI_COMMAND, (u16 *)&(pci_cmd));
-
pci_set_master(pcid);
pDevice->memaddr = pci_resource_start(pcid, 0);