From patchwork Wed Jan 5 21:03:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 77634 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.180.67]) by ozlabs.org (Postfix) with ESMTP id 10F66B70FB for ; Thu, 6 Jan 2011 08:03:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751808Ab1AEVDt (ORCPT ); Wed, 5 Jan 2011 16:03:49 -0500 Received: from pfepa.post.tele.dk ([195.41.46.235]:54316 "EHLO pfepa.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751029Ab1AEVDs (ORCPT ); Wed, 5 Jan 2011 16:03:48 -0500 Received: from localhost.localdomain (x1-6-00-1e-2a-84-ae-3e.k225.webspeed.dk [80.163.61.94]) by pfepa.post.tele.dk (Postfix) with ESMTP id AD823A50004; Wed, 5 Jan 2011 22:03:46 +0100 (CET) From: Sam Ravnborg To: "David S. Miller" , sparclinux Cc: Sam Ravnborg Subject: [PATCH 2/4] sunhme: cleanup conditional on CONFIG_SBUS Date: Wed, 5 Jan 2011 22:03:45 +0100 Message-Id: <1294261427-26104-2-git-send-email-sam@ravnborg.org> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <20110105210217.GA22415@merkur.ravnborg.org> References: <20110105210217.GA22415@merkur.ravnborg.org> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org sparc has always SBUS defined. So there is no need to have #ifdef CONFIG_SBUS within code that is SPARC only. Signed-off-by: Sam Ravnborg --- drivers/net/sunhme.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 5e28c41..e716795 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -1578,18 +1578,13 @@ static int happy_meal_init(struct happy_meal *hp) hme_write32(hp, gregs + GREG_CFG, GREG_CFG_BURST64); #else if ((hp->happy_bursts & DMA_BURST64) && - ((hp->happy_flags & HFLAG_PCI) != 0 -#ifdef CONFIG_SBUS - || sbus_can_burst64() -#endif - || 0)) { + ((hp->happy_flags & HFLAG_PCI) != 0 || sbus_can_burst64() || 0)) { u32 gcfg = GREG_CFG_BURST64; /* I have no idea if I should set the extended * transfer mode bit for Cheerio, so for now I * do not. -DaveM */ -#ifdef CONFIG_SBUS if ((hp->happy_flags & HFLAG_PCI) == 0) { struct platform_device *op = hp->happy_dev; if (sbus_can_dma_64bit()) { @@ -1598,8 +1593,6 @@ static int happy_meal_init(struct happy_meal *hp) gcfg |= GREG_CFG_64BIT; } } -#endif - HMD(("64>")); hme_write32(hp, gregs + GREG_CFG, gcfg); } else if (hp->happy_bursts & DMA_BURST32) {