[patch 3/3] drivers/net/smc911x.c: smc911x_drv_probe() cleanup
From: akpm@linux-foundation.org
Date: 2008-12-01 22:25:48
From: Andrew Morton <akpm@linux-foundation.org> Save an ugly ifdef. Cc: "Dasgupta, Romit" <redacted> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Jeff Garzik <redacted> Cc: Romit Dasgupta <redacted> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- drivers/net/smc911x.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/net/smc911x.c~netdev-smc911x-fix-for-driver-resume-cleanup drivers/net/smc911x.c
--- a/drivers/net/smc911x.c~netdev-smc911x-fix-for-driver-resume-cleanup
+++ a/drivers/net/smc911x.c@@ -2050,9 +2050,6 @@ err_out: */ static int __devinit smc911x_drv_probe(struct platform_device *pdev) { -#ifdef SMC_DYNAMIC_BUS_CONFIG - struct smc911x_platdata *pd = pdev->dev.platform_data; -#endif struct net_device *ndev; struct resource *res; struct smc911x_local *lp;
@@ -2087,11 +2084,14 @@ static int __devinit smc911x_drv_probe(s lp = netdev_priv(ndev); lp->netdev = ndev; #ifdef SMC_DYNAMIC_BUS_CONFIG - if (!pd) { - ret = -EINVAL; - goto release_both; + { + struct smc911x_platdata *pd = pdev->dev.platform_data; + if (!pd) { + ret = -EINVAL; + goto release_both; + } + memcpy(&lp->cfg, pd, sizeof(lp->cfg)); } - memcpy(&lp->cfg, pd, sizeof(lp->cfg)); #endif addr = ioremap(res->start, SMC911X_IO_EXTENT);
_