From patchwork Mon Dec 1 22:24:46 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3/3] drivers/net/smc911x.c: smc911x_drv_probe() cleanup Date: Mon, 01 Dec 2008 12:24:46 -0000 From: Andrew Morton X-Patchwork-Id: 11669 Message-Id: <200812012224.mB1MOl2J015252@imap1.linux-foundation.org> To: jeff@garzik.org Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, catalin.marinas@arm.com, romit@ti.com From: Andrew Morton Save an ugly ifdef. Cc: "Dasgupta, Romit" Cc: Catalin Marinas Cc: Jeff Garzik Cc: Romit Dasgupta Signed-off-by: Andrew Morton --- 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);