@@ -241,12 +241,6 @@ static char version[] =
241
241
*/
242
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
244
#ifdef CONFIG_EISA
251
245
#define DFX_BUS_EISA (dev ) (dev->bus == &eisa_bus_type)
252
246
#else
@@ -436,7 +430,7 @@ static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)
436
430
static void dfx_get_bars (struct device * bdev ,
437
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
434
int dfx_bus_eisa = DFX_BUS_EISA (bdev );
441
435
int dfx_bus_tc = DFX_BUS_TC (bdev );
442
436
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc ;
@@ -518,7 +512,7 @@ static const struct net_device_ops dfx_netdev_ops = {
518
512
static int dfx_register (struct device * bdev )
519
513
{
520
514
static int version_disp ;
521
- int dfx_bus_pci = DFX_BUS_PCI (bdev );
515
+ int dfx_bus_pci = dev_is_pci (bdev );
522
516
int dfx_bus_tc = DFX_BUS_TC (bdev );
523
517
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc ;
524
518
const char * print_name = dev_name (bdev );
@@ -667,7 +661,7 @@ static void dfx_bus_init(struct net_device *dev)
667
661
{
668
662
DFX_board_t * bp = netdev_priv (dev );
669
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
665
int dfx_bus_eisa = DFX_BUS_EISA (bdev );
672
666
int dfx_bus_tc = DFX_BUS_TC (bdev );
673
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
808
DFX_board_t * bp = netdev_priv (dev );
815
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
811
int dfx_bus_eisa = DFX_BUS_EISA (bdev );
818
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
962
DFX_board_t * bp = netdev_priv (dev );
969
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
965
int dfx_bus_eisa = DFX_BUS_EISA (bdev );
972
966
int dfx_bus_tc = DFX_BUS_TC (bdev );
973
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
1871
struct net_device * dev = dev_id ;
1878
1872
DFX_board_t * bp = netdev_priv (dev );
1879
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
1875
int dfx_bus_eisa = DFX_BUS_EISA (bdev );
1882
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
3574
struct net_device * dev = dev_get_drvdata (bdev );
3581
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
3577
int dfx_bus_tc = DFX_BUS_TC (bdev );
3584
3578
int dfx_use_mmio = DFX_MMIO || dfx_bus_tc ;
3585
3579
resource_size_t bar_start = 0 ; /* pointer to port */
0 commit comments