Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcdff139 authored by Maciej W. Rozycki's avatar Maciej W. Rozycki Committed by Jeff Garzik
Browse files

defxx: Use __maybe_unused rather than a local hack 



 This is a change to remove a local hack in favour to __maybe_unused that
has been recently added.

Signed-off-by: default avatarMaciej W. Rozycki <macro@linux-mips.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 52cb1c2b

drivers/net/defxx.c

+8 −9
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 


/* Include files */

#include <linux/bitops.h>

#include <linux/compiler.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/eisa.h>
@@ -240,8 +241,6 @@ static char version[] __devinitdata = 
 */

#define NEW_SKB_SIZE (PI_RCV_DATA_K_SIZE_MAX+128)



#define __unused __attribute__ ((unused))



#ifdef CONFIG_PCI

#define DFX_BUS_PCI(dev) (dev->bus == &pci_bus_type)

#else
@@ -375,7 +374,7 @@ static inline void dfx_outl(DFX_board_t *bp, int offset, u32 data) 


static void dfx_port_write_long(DFX_board_t *bp, int offset, u32 data)

{

	struct device __unused *bdev = bp->bus_dev;

	struct device __maybe_unused *bdev = bp->bus_dev;

	int dfx_bus_tc = DFX_BUS_TC(bdev);

	int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -399,7 +398,7 @@ static inline void dfx_inl(DFX_board_t *bp, int offset, u32 *data) 


static void dfx_port_read_long(DFX_board_t *bp, int offset, u32 *data)

{

	struct device __unused *bdev = bp->bus_dev;

	struct device __maybe_unused *bdev = bp->bus_dev;

	int dfx_bus_tc = DFX_BUS_TC(bdev);

	int dfx_use_mmio = DFX_MMIO || dfx_bus_tc;
@@ -866,7 +865,7 @@ static void __devinit dfx_bus_uninit(struct net_device *dev) 


static void __devinit dfx_bus_config_check(DFX_board_t *bp)

{

	struct device __unused *bdev = bp->bus_dev;

	struct device __maybe_unused *bdev = bp->bus_dev;

	int dfx_bus_eisa = DFX_BUS_EISA(bdev);

	int	status;				/* return code from adapter port control call */

	u32	host_data;			/* LW data returned from port control call */
@@ -3624,8 +3623,8 @@ static void __devexit dfx_unregister(struct device *bdev) 
}





static int __devinit __unused dfx_dev_register(struct device *);

static int __devexit __unused dfx_dev_unregister(struct device *);

static int __devinit __maybe_unused dfx_dev_register(struct device *);

static int __devexit __maybe_unused dfx_dev_unregister(struct device *);



#ifdef CONFIG_PCI

static int __devinit dfx_pci_register(struct pci_dev *,
@@ -3699,7 +3698,7 @@ static struct tc_driver dfx_tc_driver = { 
};

#endif /* CONFIG_TC */



static int __devinit __unused dfx_dev_register(struct device *dev)

static int __devinit __maybe_unused dfx_dev_register(struct device *dev)

{

	int status;
@@ -3709,7 +3708,7 @@ static int __devinit __unused dfx_dev_register(struct device *dev) 
	return status;

}



static int __devexit __unused dfx_dev_unregister(struct device *dev)

static int __devexit __maybe_unused dfx_dev_unregister(struct device *dev)

{

	put_device(dev);

	dfx_unregister(dev);