From patchwork Mon Dec 1 22:24:46 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 11669 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 80F2ADDDEA for ; Tue, 2 Dec 2008 09:25:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764AbYLAWZt (ORCPT ); Mon, 1 Dec 2008 17:25:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752269AbYLAWZs (ORCPT ); Mon, 1 Dec 2008 17:25:48 -0500 Received: from smtp1.linux-foundation.org ([140.211.169.13]:52239 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922AbYLAWZs (ORCPT ); Mon, 1 Dec 2008 17:25:48 -0500 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id mB1MOlvj020021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 1 Dec 2008 14:24:48 -0800 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id mB1MOl2J015252; Mon, 1 Dec 2008 14:24:47 -0800 Message-Id: <200812012224.mB1MOl2J015252@imap1.linux-foundation.org> Subject: [patch 3/3] drivers/net/smc911x.c: smc911x_drv_probe() cleanup To: jeff@garzik.org Cc: netdev@vger.kernel.org, akpm@linux-foundation.org, catalin.marinas@arm.com, romit@ti.com From: akpm@linux-foundation.org Date: Mon, 01 Dec 2008 14:24:46 -0800 X-Spam-Status: No, hits=-3.399 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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);