Skip to content

Commit 5349d93

Browse files
YijingWangdavem330
authored andcommitted
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 <[email protected]> Signed-off-by: Yijing Wang <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 7b7fc97 commit 5349d93

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

drivers/net/fddi/defxx.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,6 @@ static char version[] =
241241
*/
242242
#define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)
243243

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-
250244
#ifdef CONFIG_EISA
251245
#define DFX_BUS_EISA(dev) (dev->bus == &eisa_bus_type)
252246
#else
@@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
436430
static void dfx_get_bars(struct device *bdev,
437431
resource_size_t *bar_start, resource_size_t *bar_len)
438432
{
439-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
433+
int dfx_bus_pci = dev_is_pci(bdev);
440434
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
441435
int dfx_bus_tc = DFX_BUS_TC(bdev);
442436
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -518,7 +512,7 @@ static const struct net_device_ops dfx_netdev_ops = {
518512
static int dfx_register(struct device *bdev)
519513
{
520514
static int version_disp;
521-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
515+
int dfx_bus_pci = dev_is_pci(bdev);
522516
int dfx_bus_tc = DFX_BUS_TC(bdev);
523517
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
524518
const char *print_name = dev_name(bdev);
@@ -667,7 +661,7 @@ static void dfx_bus_init(struct net_device *dev)
667661
{
668662
DFX_board_t *bp = netdev_priv(dev);
669663
struct device *bdev = bp->bus_dev;
670-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
664+
int dfx_bus_pci = dev_is_pci(bdev);
671665
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
672666
int dfx_bus_tc = DFX_BUS_TC(bdev);
673667
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -813,7 +807,7 @@ static void dfx_bus_uninit(struct net_device *dev)
813807
{
814808
DFX_board_t *bp = netdev_priv(dev);
815809
struct device *bdev = bp->bus_dev;
816-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
810+
int dfx_bus_pci = dev_is_pci(bdev);
817811
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
818812
u8 val;
819813

@@ -967,7 +961,7 @@ static int dfx_driver_init(struct net_device *dev, const char *print_name,
967961
{
968962
DFX_board_t *bp = netdev_priv(dev);
969963
struct device *bdev = bp->bus_dev;
970-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
964+
int dfx_bus_pci = dev_is_pci(bdev);
971965
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
972966
int dfx_bus_tc = DFX_BUS_TC(bdev);
973967
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -1877,7 +1871,7 @@ static irqreturn_t dfx_interrupt(int irq, void *dev_id)
18771871
struct net_device *dev = dev_id;
18781872
DFX_board_t *bp = netdev_priv(dev);
18791873
struct device *bdev = bp->bus_dev;
1880-
int dfx_bus_pci = DFX_BUS_PCI(bdev);
1874+
int dfx_bus_pci = dev_is_pci(bdev);
18811875
int dfx_bus_eisa = DFX_BUS_EISA(bdev);
18821876
int dfx_bus_tc = DFX_BUS_TC(bdev);
18831877

@@ -3579,7 +3573,7 @@ static void dfx_unregister(struct device *bdev)
35793573
{
35803574
struct net_device *dev = dev_get_drvdata(bdev);
35813575
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);
35833577
int dfx_bus_tc = DFX_BUS_TC(bdev);
35843578
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
35853579
resource_size_t bar_start = 0; /* pointer to port */

0 commit comments

Comments
 (0)