diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rt2860/iface/rtmp_pci.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rt2860/iface/rtmp_pci.h')
-rw-r--r-- | drivers/staging/rt2860/iface/rtmp_pci.h | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/drivers/staging/rt2860/iface/rtmp_pci.h b/drivers/staging/rt2860/iface/rtmp_pci.h index 7759d56..3d66e38 100644 --- a/drivers/staging/rt2860/iface/rtmp_pci.h +++ b/drivers/staging/rt2860/iface/rtmp_pci.h @@ -32,7 +32,7 @@ ((struct os_cookie *)handle)->pci_dev = dev_p; #ifdef LINUX -// set driver data +/* set driver data */ #define RT28XX_DRVDATA_SET(_a) pci_set_drvdata(_a, net_dev); #define RT28XX_PUT_DEVICE(dev_p) @@ -42,7 +42,8 @@ #ifdef PCI_MSI_SUPPORT #define RTMP_MSI_ENABLE(_pAd) \ { struct os_cookie *_pObj = (struct os_cookie *)(_pAd->OS_Cookie); \ - (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) == 0 ? TRUE : FALSE; \ + (_pAd)->HaveMsi = pci_enable_msi(_pObj->pci_dev) \ + == 0 ? TRUE : FALSE; \ } #define RTMP_MSI_DISABLE(_pAd) \ @@ -52,27 +53,28 @@ _pAd->HaveMsi = FALSE; \ } #else -#define RTMP_MSI_ENABLE(_pAd) do{}while(0) -#define RTMP_MSI_DISABLE(_pAd) do{}while(0) -#endif // PCI_MSI_SUPPORT // +#define RTMP_MSI_ENABLE(_pAd) do {} while (0) +#define RTMP_MSI_DISABLE(_pAd) do {} while (0) +#endif /* PCI_MSI_SUPPORT */ -#define RTMP_PCI_DEV_UNMAP() \ -{ if (net_dev->base_addr) { \ - iounmap((void *)(net_dev->base_addr)); \ +#define RTMP_PCI_DEV_UNMAP() \ +{ if (net_dev->base_addr) { \ + iounmap((void *)(net_dev->base_addr)); \ release_mem_region(pci_resource_start(dev_p, 0), \ - pci_resource_len(dev_p, 0)); } \ - if (net_dev->irq) pci_release_regions(dev_p); } + pci_resource_len(dev_p, 0)); } \ + if (net_dev->irq) \ + pci_release_regions(dev_p); } -#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) \ - if (pci_read_config_word(pci_dev, offset, ®16) == 0) \ - Configuration = le2cpu16(reg16); \ - else \ - Configuration = 0; +#define PCI_REG_READ_WORD(pci_dev, offset, Configuration) {\ + if (pci_read_config_word(pci_dev, offset, ®16) == 0) \ + Configuration = le2cpu16(reg16); \ + else \ + Configuration = 0; } -#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) \ - reg16 = cpu2le16(Configuration); \ - pci_write_config_word(pci_dev, offset, reg16); +#define PCI_REG_WIRTE_WORD(pci_dev, offset, Configuration) {\ + reg16 = cpu2le16(Configuration); \ + pci_write_config_word(pci_dev, offset, reg16); } -#endif // LINUX // +#endif /* LINUX */ -#endif // __RTMP_PCI_H__ // +#endif /* __RTMP_PCI_H__ */ |