From patchwork Fri Apr 20 20:56:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 154142 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 63BC4B6FBC for ; Sat, 21 Apr 2012 06:57:10 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753872Ab2DTU4t (ORCPT ); Fri, 20 Apr 2012 16:56:49 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:34059 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753725Ab2DTU4c (ORCPT ); Fri, 20 Apr 2012 16:56:32 -0400 Received: by mail-pb0-f46.google.com with SMTP id un15so1475811pbc.19 for ; Fri, 20 Apr 2012 13:56:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=bZETOs/J11Il60Qwe2+6rFMJOnk5EU8kStTYZbbYA/c=; b=F1w59AWBeDqWOCg9rmGVHsbffOaNua0gd9LGO8NDMQV+SZPNW7kRZ/l4ipxe94+/OX n6FrNKwxkFfo0rTkSWD29BjWls8cVW5Xq2xzAtU/gT8f9r+B6KccfIygP5iiayo30OzK Ct470vGQhXQKK+lZzeTNeK7CkH1hhhRjPHj48/bpo+/CEdfpErGHScDY6O500FZUHJzR w2d7L7WsjC/xDzaSHYUPJyiRIYD0B8WYqcCyDmmiDSaiwbaQa8FElYoa3qzMuVa77nJH OzVqOEyCIxzGhDIh8OaLPHLdpoK3qgKn6T8vDiTvcW8Y7AbV+4Lr0lW8jg+mKfNFMztD 3aqg== Received: by 10.68.134.133 with SMTP id pk5mr15839399pbb.17.1334955392448; Fri, 20 Apr 2012 13:56:32 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id pg1sm6317632pbc.21.2012.04.20.13.56.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 20 Apr 2012 13:56:32 -0700 (PDT) From: mathieu.poirier@linaro.org To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, mathieu.poirier@linaro.org Subject: [PATCH 8/8] drivers/net: decouple ISA and ISA_DMA_API Date: Fri, 20 Apr 2012 14:56:16 -0600 Message-Id: <1334955376-17793-9-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1334955376-17793-1-git-send-email-mathieu.poirier@linaro.org> References: <1334955376-17793-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQmdIvBQdNrXQ1uYA+wHBjOdxrWM+R1YLWX8/IujMmIERAskvwEQZBbts8/buf9DPAwP8KO2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann The two options are separate, and some platforms (e.g. arm pxa) have ISA slots but no ISA dma controller, so they cannot build drivers using the DMA API functions. Signed-off-by: Arnd Bergmann Signed-off-by: Mathieu Poirier --- drivers/net/tokenring/Kconfig | 6 +++--- drivers/net/tokenring/tms380tr.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/tokenring/Kconfig b/drivers/net/tokenring/Kconfig index 45550d4..ef3bb13 100644 --- a/drivers/net/tokenring/Kconfig +++ b/drivers/net/tokenring/Kconfig @@ -98,7 +98,7 @@ config 3C359 config TMS380TR tristate "Generic TMS380 Token Ring ISA/PCI adapter support" - depends on PCI || ISA && ISA_DMA_API || MCA + depends on PCI || ISA || MCA select FW_LOADER ---help--- This driver provides generic support for token ring adapters @@ -137,7 +137,7 @@ config TMSPCI config SKISA tristate "SysKonnect TR4/16 ISA support" - depends on TMS380TR && ISA + depends on TMS380TR && ISA && ISA_DMA_API help This tms380 module supports SysKonnect TR4/16 ISA cards. @@ -149,7 +149,7 @@ config SKISA config PROTEON tristate "Proteon ISA support" - depends on TMS380TR && ISA + depends on TMS380TR && ISA && ISA_DMA_API help This tms380 module supports Proteon ISA cards. diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index be4813e..b5e0855 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c @@ -254,7 +254,7 @@ int tms380tr_open(struct net_device *dev) /* Reset the hardware here. Don't forget to set the station address. */ -#ifdef CONFIG_ISA +#if defined(CONFIG_ISA) && defined(CONFIG_ISA_DMA_API) if(dev->dma > 0) { unsigned long flags=claim_dma_lock(); @@ -1125,8 +1125,8 @@ int tms380tr_close(struct net_device *dev) del_timer(&tp->timer); tms380tr_disable_interrupts(dev); - -#ifdef CONFIG_ISA + +#if defined(CONFIG_ISA) && defined(CONFIG_ISA_DMA_API) if(dev->dma > 0) { unsigned long flags=claim_dma_lock();