aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/fddi
diff options
context:
space:
mode:
authorYijing Wang <wangyijing@huawei.com>2013-12-06 01:34:19 -0500
committerDavid S. Miller <davem@davemloft.net>2013-12-06 12:51:40 -0500
commit5349d937739a752b3a3c0981543c13654af3bec9 (patch)
tree965256d4c41d4529c6ec55e3146f778b23a6895f /drivers/net/fddi
parent7b7fc97aa390dfe4770e1d19e215fa289d94b477 (diff)
net/fddi: Replace local macro with PCI standard macro
Replace local macro DFX_BUS_PCI() with PCI standard macro dev_is_pci(). Acked-by: Maciej W. Rozycki <macro@linux-mips.org> Signed-off-by: Yijing Wang <wangyijing@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/fddi')
-rw-r--r--drivers/net/fddi/defxx.c20
1 files changed, 7 insertions, 13 deletions
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c
index 0b40e1c46f07..0344f71bf4a5 100644
--- a/drivers/net/fddi/defxx.c
+++ b/drivers/net/fddi/defxx.c
@@ -241,12 +241,6 @@ static char version[] =
241 */ 241 */
242#define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128) 242#define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)
243 243
244#ifdef CONFIG_PCI
245#define DFX_BUS_PCI(dev) (dev->bus == &pci_bus_type)
246#else
247#define DFX_BUS_PCI(dev) 0
248#endif
249
250#ifdef CONFIG_EISA 244#ifdef CONFIG_EISA
251#define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type) 245#define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type)
252#else 246#else
@@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
436static void dfx_get_bars(struct device *bdev, 430static void dfx_get_bars(struct device *bdev,
437 resource_size_t *bar_start, resource_size_t *bar_len) 431 resource_size_t *bar_start, resource_size_t *bar_len)
438{ 432{
439 int dfx_bus_pci = DFX_BUS_PCI(bdev); 433 int dfx_bus_pci = dev_is_pci(bdev);
440 int dfx_bus_eisa = DFX_BUS_EISA(bdev); 434 int dfx_bus_eisa = DFX_BUS_EISA(bdev);
441 int dfx_bus_tc = DFX_BUS_TC(bdev); 435 int dfx_bus_tc = DFX_BUS_TC(bdev);
442 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc; 436 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -518,7 +512,7 @@ static const struct net_device_ops dfx_netdev_ops = {
518static int dfx_register(struct device *bdev) 512static int dfx_register(struct device *bdev)
519{ 513{
520 static int version_disp; 514 static int version_disp;
521 int dfx_bus_pci = DFX_BUS_PCI(bdev); 515 int dfx_bus_pci = dev_is_pci(bdev);
522 int dfx_bus_tc = DFX_BUS_TC(bdev); 516 int dfx_bus_tc = DFX_BUS_TC(bdev);
523 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc; 517 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
524 const char *print_name = dev_name(bdev); 518 const char *print_name = dev_name(bdev);
@@ -667,7 +661,7 @@ static void dfx_bus_init(struct net_device *dev)
667{ 661{
668 DFX_board_t *bp = netdev_priv(dev); 662 DFX_board_t *bp = netdev_priv(dev);
669 struct device *bdev = bp->bus_dev; 663 struct device *bdev = bp->bus_dev;
670 int dfx_bus_pci = DFX_BUS_PCI(bdev); 664 int dfx_bus_pci = dev_is_pci(bdev);
671 int dfx_bus_eisa = DFX_BUS_EISA(bdev); 665 int dfx_bus_eisa = DFX_BUS_EISA(bdev);
672 int dfx_bus_tc = DFX_BUS_TC(bdev); 666 int dfx_bus_tc = DFX_BUS_TC(bdev);
673 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc; 667 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -813,7 +807,7 @@ static void dfx_bus_uninit(struct net_device *dev)
813{ 807{
814 DFX_board_t *bp = netdev_priv(dev); 808 DFX_board_t *bp = netdev_priv(dev);
815 struct device *bdev = bp->bus_dev; 809 struct device *bdev = bp->bus_dev;
816 int dfx_bus_pci = DFX_BUS_PCI(bdev); 810 int dfx_bus_pci = dev_is_pci(bdev);
817 int dfx_bus_eisa = DFX_BUS_EISA(bdev); 811 int dfx_bus_eisa = DFX_BUS_EISA(bdev);
818 u8 val; 812 u8 val;
819 813
@@ -967,7 +961,7 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
967{ 961{
968 DFX_board_t *bp = netdev_priv(dev); 962 DFX_board_t *bp = netdev_priv(dev);
969 struct device *bdev = bp->bus_dev; 963 struct device *bdev = bp->bus_dev;
970 int dfx_bus_pci = DFX_BUS_PCI(bdev); 964 int dfx_bus_pci = dev_is_pci(bdev);
971 int dfx_bus_eisa = DFX_BUS_EISA(bdev); 965 int dfx_bus_eisa = DFX_BUS_EISA(bdev);
972 int dfx_bus_tc = DFX_BUS_TC(bdev); 966 int dfx_bus_tc = DFX_BUS_TC(bdev);
973 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc; 967 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -1877,7 +1871,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id)
1877 struct net_device *dev = dev_id; 1871 struct net_device *dev = dev_id;
1878 DFX_board_t *bp = netdev_priv(dev); 1872 DFX_board_t *bp = netdev_priv(dev);
1879 struct device *bdev = bp->bus_dev; 1873 struct device *bdev = bp->bus_dev;
1880 int dfx_bus_pci = DFX_BUS_PCI(bdev); 1874 int dfx_bus_pci = dev_is_pci(bdev);
1881 int dfx_bus_eisa = DFX_BUS_EISA(bdev); 1875 int dfx_bus_eisa = DFX_BUS_EISA(bdev);
1882 int dfx_bus_tc = DFX_BUS_TC(bdev); 1876 int dfx_bus_tc = DFX_BUS_TC(bdev);
1883 1877
@@ -3579,7 +3573,7 @@ static void dfx_unregister(struct device *bdev)
3579{ 3573{
3580 struct net_device *dev = dev_get_drvdata(bdev); 3574 struct net_device *dev = dev_get_drvdata(bdev);
3581 DFX_board_t *bp = netdev_priv(dev); 3575 DFX_board_t *bp = netdev_priv(dev);
3582 int dfx_bus_pci = DFX_BUS_PCI(bdev); 3576 int dfx_bus_pci = dev_is_pci(bdev);
3583 int dfx_bus_tc = DFX_BUS_TC(bdev); 3577 int dfx_bus_tc = DFX_BUS_TC(bdev);
3584 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc; 3578 int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
3585 resource_size_t bar_start = 0; /* pointer to port */ 3579 resource_size_t bar_start = 0; /* pointer to port */