From patchwork Wed Jan 5 21:03:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sam Ravnborg X-Patchwork-Id: 77635 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 9F5D4B7108 for ; Thu, 6 Jan 2011 08:03:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751785Ab1AEVDt (ORCPT ); Wed, 5 Jan 2011 16:03:49 -0500 Received: from pfepa.post.tele.dk ([195.41.46.235]:54319 "EHLO pfepa.post.tele.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751474Ab1AEVDs (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 CE077A5001A; Wed, 5 Jan 2011 22:03:46 +0100 (CET) From: Sam Ravnborg To: "David S. Miller" , sparclinux Cc: Sam Ravnborg Subject: [PATCH 3/4] cs4231: cleanup conditional on CONFIG_SBUS Date: Wed, 5 Jan 2011 22:03:46 +0100 Message-Id: <1294261427-26104-3-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 This driver is sparc-only. And as sparc always has SBUS enabled then there is no point in keeping #ifdef SBUS Signed-off-by: Sam Ravnborg --- sound/sparc/cs4231.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c index c276086..b72eca9 100644 --- a/sound/sparc/cs4231.c +++ b/sound/sparc/cs4231.c @@ -27,10 +27,6 @@ #include #include -#ifdef CONFIG_SBUS -#define SBUS_SUPPORT -#endif - #if defined(CONFIG_PCI) && defined(CONFIG_SPARC64) #define EBUS_SUPPORT #include @@ -53,13 +49,11 @@ MODULE_DESCRIPTION("Sun CS4231"); MODULE_LICENSE("GPL"); MODULE_SUPPORTED_DEVICE("{{Sun,CS4231}}"); -#ifdef SBUS_SUPPORT struct sbus_dma_info { spinlock_t lock; /* DMA access lock */ int dir; void __iomem *regs; }; -#endif struct snd_cs4231; struct cs4231_dma_control { @@ -72,9 +66,7 @@ struct cs4231_dma_control { #ifdef EBUS_SUPPORT struct ebus_dma_info ebus_info; #endif -#ifdef SBUS_SUPPORT struct sbus_dma_info sbus_info; -#endif }; struct snd_cs4231 { @@ -1620,8 +1612,6 @@ out_err: return err; } -#ifdef SBUS_SUPPORT - static irqreturn_t snd_cs4231_sbus_interrupt(int irq, void *dev_id) { unsigned long flags; @@ -1880,7 +1870,6 @@ static int __devinit cs4231_sbus_probe(struct platform_device *op, const struct return cs4231_attach_finish(card); } -#endif #ifdef EBUS_SUPPORT @@ -2078,11 +2067,9 @@ static int __devinit cs4231_probe(struct platform_device *op, const struct of_de if (!strcmp(op->dev.of_node->parent->name, "ebus")) return cs4231_ebus_probe(op, match); #endif -#ifdef SBUS_SUPPORT if (!strcmp(op->dev.of_node->parent->name, "sbus") || !strcmp(op->dev.of_node->parent->name, "sbi")) return cs4231_sbus_probe(op, match); -#endif return -ENODEV; }