diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2015-09-12 19:10:38 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-09-14 08:50:46 -0700 |
| commit | a03b8b3e18969e10d5fdc732a06b5c58c247e842 (patch) | |
| tree | 06262613eccafd1f71280db2bb9b910b7a4cf13f /drivers/staging/vt6655 | |
| parent | 70d66a6a753b19a3de5ab167fe8b941eac32c079 (diff) | |
| download | lwn-a03b8b3e18969e10d5fdc732a06b5c58c247e842.tar.gz lwn-a03b8b3e18969e10d5fdc732a06b5c58c247e842.zip | |
staging: vt6655: Move code in device_get_pci_info
Function always returns true and now only a few lines move
to vt6655_probe.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6655')
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index add9cdf01255..326bce31c9ca 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -29,7 +29,6 @@ * vt6655_probe - module initial (insmod) driver entry * vt6655_remove - module remove entry * device_free_info - device structure resource free function - * device_get_pci_info - get allocated pci io/mem resource * device_print_info - print out resource * device_rx_srv - rx service function * device_alloc_rx_buf - rx buffer pre-allocated function @@ -136,7 +135,6 @@ static const struct pci_device_id vt6655_pci_id_table[] = { static int vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent); static void device_free_info(struct vnt_private *pDevice); -static bool device_get_pci_info(struct vnt_private *, struct pci_dev *pcid); static void device_print_info(struct vnt_private *pDevice); static void device_init_rd0_ring(struct vnt_private *pDevice); @@ -430,17 +428,6 @@ static void device_print_info(struct vnt_private *pDevice) (unsigned long)pDevice->PortOffset, pDevice->pcid->irq); } -static bool device_get_pci_info(struct vnt_private *pDevice, - struct pci_dev *pcid) -{ - pci_set_master(pcid); - - pDevice->memaddr = pci_resource_start(pcid, 0); - pDevice->ioaddr = pci_resource_start(pcid, 1); - - return true; -} - static void device_free_info(struct vnt_private *pDevice) { if (!pDevice) @@ -1629,12 +1616,10 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) dev_dbg(&pcid->dev, "Before get pci_info memaddr is %x\n", priv->memaddr); - if (!device_get_pci_info(priv, pcid)) { - dev_err(&pcid->dev, ": Failed to find PCI device.\n"); - device_free_info(priv); - return -ENODEV; - } + pci_set_master(pcid); + priv->memaddr = pci_resource_start(pcid, 0); + priv->ioaddr = pci_resource_start(pcid, 1); priv->PortOffset = ioremap(priv->memaddr & PCI_BASE_ADDRESS_MEM_MASK, 256); if (!priv->PortOffset) { |