summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2007-02-10 01:45:33 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-11 10:51:30 -0800
commit889074ee0be9cc6c2a698d95db4d0927485ec139 (patch)
treeccf0018c2a4413e6697e567ddde4499ad07b8f7f
parentc251ae0d7514563c7fdace0d390175454761228b (diff)
[PATCH] Char: moxa, remove moxa_pci_devinfo
Nothing is used from this struct but *pdev. Remove it and store only pdev. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/char/moxa.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c
index 9eb8fa6dd168..2899beafeb0f 100644
--- a/drivers/char/moxa.c
+++ b/drivers/char/moxa.c
@@ -102,18 +102,12 @@ static struct moxa_isa_board_conf moxa_isa_boards[] =
/* {MOXA_BOARD_C218_ISA,8,0xDC000}, */
};
-struct moxa_pci_devinfo {
- ushort busNum;
- ushort devNum;
- struct pci_dev *pdev;
-};
-
struct moxa_board_conf {
int boardType;
int numPorts;
unsigned long baseAddr;
int busType;
- struct moxa_pci_devinfo pciInfo;
+ struct pci_dev *pdev;
};
static struct moxa_board_conf moxa_boards[MAX_BOARDS];
@@ -284,11 +278,8 @@ static int moxa_get_PCI_conf(struct pci_dev *p, int board_type,
break;
}
board->busType = MOXA_BUS_TYPE_PCI;
- board->pciInfo.busNum = p->bus->number;
- board->pciInfo.devNum = p->devfn >> 3;
- board->pciInfo.pdev = p;
/* don't lose the reference in the next pci_get_device iteration */
- pci_dev_get(p);
+ board->pdev = pci_dev_get(p);
return (0);
}
@@ -437,7 +428,7 @@ static void __exit moxa_exit(void)
if (moxaBaseAddr[i])
iounmap(moxaBaseAddr[i]);
if (moxa_boards[i].busType == MOXA_BUS_TYPE_PCI)
- pci_dev_put(moxa_boards[i].pciInfo.pdev);
+ pci_dev_put(moxa_boards[i].pdev);
}
if (verbose)