diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-15 23:00:05 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-17 17:02:56 +0300 |
| commit | df31d6716d16dc5c1f1962b5087829a5d1272253 (patch) | |
| tree | 6074fc5d54e0c973b810adce2ceb39096dd44186 | |
| parent | 1d9bc2604cdd2fca1b23fcb6f1c9f5a36475689a (diff) | |
| download | linux-df31d6716d16dc5c1f1962b5087829a5d1272253.tar.xz | |
staging: dgnc: delete a bunch of PCI board variables
None of these were being used at all, only set and never used again, so
remove them from the code.
Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.c | 8 | ||||
| -rw-r--r-- | drivers/staging/dgnc/dgnc_driver.h | 14 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/dgnc/dgnc_driver.c b/drivers/staging/dgnc/dgnc_driver.c index 0ab8bc6f3662..32f10bc50d49 100644 --- a/drivers/staging/dgnc/dgnc_driver.c +++ b/drivers/staging/dgnc/dgnc_driver.c @@ -84,11 +84,8 @@ static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id) /* store the info for the board we've found */ brd->boardnum = dgnc_num_boards; - brd->vendor = dgnc_pci_tbl[id].vendor; brd->device = dgnc_pci_tbl[id].device; brd->pdev = pdev; - brd->pci_bus = pdev->bus->number; - brd->pci_slot = PCI_SLOT(pdev->devfn); brd->name = dgnc_ids[id].name; brd->maxports = dgnc_ids[id].maxports; init_waitqueue_head(&brd->state_wait); @@ -98,11 +95,6 @@ static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id) brd->state = BOARD_FOUND; - /* store which card & revision we have */ - pci_read_config_word(pdev, PCI_SUBSYSTEM_VENDOR_ID, &brd->subvendor); - pci_read_config_word(pdev, PCI_SUBSYSTEM_ID, &brd->subdevice); - pci_read_config_byte(pdev, PCI_REVISION_ID, &brd->rev); - pci_irq = pdev->irq; brd->irq = pci_irq; diff --git a/drivers/staging/dgnc/dgnc_driver.h b/drivers/staging/dgnc/dgnc_driver.h index c269497dca4d..043bbe20bf82 100644 --- a/drivers/staging/dgnc/dgnc_driver.h +++ b/drivers/staging/dgnc/dgnc_driver.h @@ -93,15 +93,8 @@ struct board_ops { * * @name: Product name. * @pdev: Pointer to the pci_dev structure. - * @vendor: PCI vendor ID. * @device: PCI device ID. - * @subvendor: PCI subsystem vendor ID. - * @subdevice: PCI subsystem device ID. - * @rev: PCI revision ID. - * @pci_bus: PCI bus value. - * @pci_slot: PCI slot value. * @maxports: Maximum ports this board can handle. - * @dvid: Board specific device ID. * @vpd: VPD of this board, if found. * @serial_num: Serial number of this board, if found in VPD. * @bd_lock: Used to protect board. @@ -128,15 +121,8 @@ struct dgnc_board { int boardnum; char *name; struct pci_dev *pdev; - u16 vendor; u16 device; - u16 subvendor; - u16 subdevice; - unsigned char rev; - uint pci_bus; - uint pci_slot; uint maxports; - unsigned char dvid; unsigned char vpd[128]; unsigned char serial_num[20]; |