• Mikael Pettersson's avatar
    ixp4xx_eth: fix dma_mapping_error() compile errors · 7144decb
    Mikael Pettersson authored
    The arm ixp4xx_eth driver doesn't compile in 2.6.27-rc1:
    
      CC [M]  drivers/net/arm/ixp4xx_eth.o
    drivers/net/arm/ixp4xx_eth.c: In function 'eth_poll':
    drivers/net/arm/ixp4xx_eth.c:554: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
    drivers/net/arm/ixp4xx_eth.c:554: error: too few arguments to function 'dma_mapping_error'
    drivers/net/arm/ixp4xx_eth.c: In function 'eth_xmit':
    drivers/net/arm/ixp4xx_eth.c:701: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
    drivers/net/arm/ixp4xx_eth.c:701: error: too few arguments to function 'dma_mapping_error'
    drivers/net/arm/ixp4xx_eth.c: In function 'init_queues':
    drivers/net/arm/ixp4xx_eth.c:886: warning: passing argument 1 of 'dma_mapping_error' makes pointer from integer without a cast
    drivers/net/arm/ixp4xx_eth.c:886: error: too few arguments to function 'dma_mapping_error'
    make[3]: *** [drivers/net/arm/ixp4xx_eth.o] Error 1
    make[2]: *** [drivers/net/arm] Error 2
    make[1]: *** [drivers/net] Error 2
    make: *** [drivers] Error 2
    
    dma_mapping_error() changed in 2.6.27-rc1 to also take a device parameter,
    but nobody bothered updating ixp4xx_eth.c. Fixed by passing the appropriate
    device value in the dma_mapping_error() calls.
    
    Tested on an ixp425 box.
    Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
    Acked-by: default avatarKrzysztof Halasa <khc@pm.waw.pl>
    Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
    7144decb
ixp4xx_eth.c 31.8 KB