mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 04:21:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: gsc_hpdi: remove board(dev) function

Browse Source 
The `board(dev)` function just casts `dev->board_ptr` to a pointer to
the private data type `struct hpdi_private` and returns it.  It's only
called from one function: `hpdi_auto_attach()`.

Remove `board()` and use a local variable to point to the `struct
hpdi_private` data structure.

Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ian Abbott
2012-11-01 16:28:30 +00:00
committed by Greg Kroah-Hartman
parent 594985d661
commit 6526cd1ad0
1 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/gsc_hpdi.c
View File

@@ -207,11 +207,6 @@ static const struct hpdi_board hpdi_boards[] = {
#endif
};
static inline struct hpdi_board *board(const struct comedi_device *dev)
{
return (struct hpdi_board *)dev->board_ptr;
}
struct hpdi_private {
/* base addresses (ioremapped) */
void __iomem *plx9080_iobase;
@@ -482,16 +477,19 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
unsigned long context_unused)
{
struct pci_dev *pcidev = comedi_to_pci_dev(dev);
const struct hpdi_board *thisboard;
struct hpdi_private *devpriv;
int i;
int retval;
dev->board_ptr = hpdi_find_board(pcidev);
if (!dev->board_ptr) {
thisboard = hpdi_find_board(pcidev);
if (!thisboard) {
dev_err(dev->class_dev, "gsc_hpdi: pci %s not supported\n",
pci_name(pcidev));
return -EINVAL;
}
dev->board_ptr = thisboard;
dev->board_name = thisboard->name;
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
if (!devpriv)
@@ -506,9 +504,6 @@ static int __devinit hpdi_auto_attach(struct comedi_device *dev,
dev->iobase = 1; /* the "detach" needs this */
pci_set_master(pcidev);
/* Initialize dev->board_name */
dev->board_name = board(dev)->name;
devpriv->plx9080_iobase =
ioremap(pci_resource_start(pcidev, PLX9080_BADDRINDEX),
pci_resource_len(pcidev, PLX9080_BADDRINDEX));