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

Commit fa6d3be0 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

[NET] smc91x: favor the use of SMC91X_USE_* instead of SMC_CAN_USE_* 



Let's simplify the logic and avoid confusion, the use of SMC91X_USE_*
is favored than SMC_CAN_USE_*, if platform data isn't given, convert
the hardcoded SMC_CAN_USE_* to SMC91X_USE_*.

Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
Acked-by: default avatarNicolas Pitre <nico@cam.org>
Acked-by: default avatarJeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d280eadc

drivers/net/smc91x.c

+3 −9
Original line number Diff line number Diff line
@@ -2154,20 +2154,14 @@ static int smc_drv_probe(struct platform_device *pdev) 


	lp = netdev_priv(ndev);



#ifdef SMC_DYNAMIC_BUS_CONFIG

	if (pd)

		memcpy(&lp->cfg, pd, sizeof(lp->cfg));

	else {

		lp->cfg.flags = SMC91X_USE_8BIT;

		lp->cfg.flags |= SMC91X_USE_16BIT;

		lp->cfg.flags |= SMC91X_USE_32BIT;

		lp->cfg.flags |= (SMC_CAN_USE_8BIT)  ? SMC91X_USE_8BIT  : 0;

		lp->cfg.flags |= (SMC_CAN_USE_16BIT) ? SMC91X_USE_16BIT : 0;

		lp->cfg.flags |= (SMC_CAN_USE_32BIT) ? SMC91X_USE_32BIT : 0;

	}



	lp->cfg.flags &= ~(SMC_CAN_USE_8BIT ? 0 : SMC91X_USE_8BIT);

	lp->cfg.flags &= ~(SMC_CAN_USE_16BIT ? 0 : SMC91X_USE_16BIT);

	lp->cfg.flags &= ~(SMC_CAN_USE_32BIT ? 0 : SMC91X_USE_32BIT);

#endif



	ndev->dma = (unsigned char)-1;



	ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

drivers/net/smc91x.h

+3 −10
Original line number Diff line number Diff line
@@ -454,7 +454,6 @@ static inline void LPD7_SMC_outsw (unsigned char* a, int r, 
#define RPC_LSA_DEFAULT		RPC_LED_100_10

#define RPC_LSB_DEFAULT		RPC_LED_TX_RX



#define SMC_DYNAMIC_BUS_CONFIG

#endif
@@ -504,15 +503,9 @@ struct smc_local { 
	struct smc91x_platdata cfg;

};



#ifdef SMC_DYNAMIC_BUS_CONFIG

#define SMC_8BIT(p) (((p)->cfg.flags & SMC91X_USE_8BIT) && SMC_CAN_USE_8BIT)

#define SMC_16BIT(p) (((p)->cfg.flags & SMC91X_USE_16BIT) && SMC_CAN_USE_16BIT)

#define SMC_32BIT(p) (((p)->cfg.flags & SMC91X_USE_32BIT) && SMC_CAN_USE_32BIT)

#else

#define SMC_8BIT(p) SMC_CAN_USE_8BIT

#define SMC_16BIT(p) SMC_CAN_USE_16BIT

#define SMC_32BIT(p) SMC_CAN_USE_32BIT

#endif

#define SMC_8BIT(p)	((p)->cfg.flags & SMC91X_USE_8BIT)

#define SMC_16BIT(p)	((p)->cfg.flags & SMC91X_USE_16BIT)

#define SMC_32BIT(p)	((p)->cfg.flags & SMC91X_USE_32BIT)



#ifdef SMC_USE_PXA_DMA

/*