diff options
Diffstat (limited to 'drivers/staging/wlags49_h2/wl_pci.c')
| -rw-r--r-- | drivers/staging/wlags49_h2/wl_pci.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 6751b4bad2e4..020b17adee2d 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c @@ -117,9 +117,13 @@ enum hermes_pci_versions { }; static struct pci_device_id wl_pci_tbl[] __devinitdata = { - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, - { WL_LKM_PCI_VENDOR_ID, WL_LKM_PCI_DEVICE_ID_2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_0, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_1, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { PCI_VENDOR_ID_WL_LKM, PCI_DEVICE_ID_WL_LKM_2, + PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_Agere_Systems_Mini_PCI_V1 }, + { } /* Terminating entry */ }; @@ -465,7 +469,7 @@ void __devexit wl_pci_remove(struct pci_dev *pdev) free_irq( dev->irq, dev ); #ifdef ENABLE_DMA - wl_pci_dma_free( pdev, (struct wl_private *)dev->priv ); + wl_pci_dma_free( pdev, dev->priv ); #endif wl_device_dealloc( dev ); @@ -534,7 +538,7 @@ int wl_pci_setup( struct pci_dev *pdev ) #ifdef ENABLE_DMA /* Allocate DMA Descriptors */ - if( wl_pci_dma_alloc( pdev, (struct wl_private *)dev->priv ) < 0 ) { + if( wl_pci_dma_alloc( pdev, dev->priv ) < 0 ) { DBG_ERROR( DbgInfo, "Could not allocate DMA descriptor memory!!!\n" ); DBG_LEAVE( DbgInfo ); return -ENOMEM; @@ -570,7 +574,7 @@ int wl_pci_setup( struct pci_dev *pdev ) } /* Make sure interrupts are enabled properly for CardBus */ - lp = (struct wl_private *)dev->priv; + lp = dev->priv; if( lp->hcfCtx.IFB_BusType == CFG_NIC_BUS_TYPE_CARDBUS || lp->hcfCtx.IFB_BusType == CFG_NIC_BUS_TYPE_PCI ) { |