From patchwork Mon Apr 11 13:25:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Breathitt Gray X-Patchwork-Id: 8801241 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 645A89FBEA for ; Mon, 11 Apr 2016 13:27:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8B21D20306 for ; Mon, 11 Apr 2016 13:27:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 89B832034F for ; Mon, 11 Apr 2016 13:27:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932829AbcDKN0y (ORCPT ); Mon, 11 Apr 2016 09:26:54 -0400 Received: from mail-yw0-f171.google.com ([209.85.161.171]:34062 "EHLO mail-yw0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932314AbcDKN0v (ORCPT ); Mon, 11 Apr 2016 09:26:51 -0400 Received: by mail-yw0-f171.google.com with SMTP id d68so208113479ywe.1; Mon, 11 Apr 2016 06:26:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=Jeg7cP1dW7yiiUl/GKq83Y+Y2xJwL/4YImy+Di+RlzE=; b=vAsoevjh3t/sefqNSLI4nIGFYEilJRT9LnLs068DJpDt6liNjUXGdzsuZvN9VUy5Rk RD9zknW+YliK3CUGs98dq2GzO+sXY/pGL703yfPHUaH8B0U0f6/YBxoQX6QvUaGtN0YX ZDEZd4V653Sds0Uw3arfBlFaxNdtj5/8NlXkqW8aRp1KBQLg1TYtBJNZMHKOznqqqj6b uctNBihIi8nuP6QTn2q40uTub/FL0C+gJT8KrVf8g88eIDTACeHHB9uGKmz5J1BtyoX7 EgZYGRmbYXrObYkyvkgPm6R9/Wve1FnPgUm2FPH4gmiw7j2+BNECEWA/9mZzQ3W7XI2+ GpYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=Jeg7cP1dW7yiiUl/GKq83Y+Y2xJwL/4YImy+Di+RlzE=; b=YXmBLhhN5A3+WYflWa7Gko4D/totba1ZNbmVZzdA0oURaGi7RhlxKHIFFldnUuR7rv TBRHLeyFSscdg7H0qX8fELcLySxZ/awnMSgC+9+AVvKMNxkGou9/8ySJKgIBrPQFZ/te H9+G9BJwLpJLgbcDgBXDDiexRQJrR5xYY1VoUvuudcUFucDxQsn7Cx+U4IBphDiOdjao 0Zqz+TaUA6jP/xDHUvNHGZp28+GUJNN+TtSf2jwJX2jPdnxIEzGsOF4Afr0m6AGLl0Ri S5zRpLKU9GOmu5HGPVOYK6hjEZPnypWTu++FJ9NRdR2ek+4uZvFqp8zSpWYyNRN2KlrT gWvw== X-Gm-Message-State: AD7BkJLfzsLvXc20a+wDsz/A2JEh8zRvK0+Km9YLPvO3I76BWlnYgmz71evge3PpPw4R5g== X-Received: by 10.129.44.139 with SMTP id s133mr10934321yws.182.1460381200499; Mon, 11 Apr 2016 06:26:40 -0700 (PDT) Received: from localhost (71-47-58-73.res.bhn.net. [71.47.58.73]) by smtp.gmail.com with ESMTPSA id d140sm14737701ywb.48.2016.04.11.06.26.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Apr 2016 06:26:40 -0700 (PDT) From: William Breathitt Gray To: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, gregkh@linuxfoundation.org Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org, alsa-devel@alsa-project.org, William Breathitt Gray Subject: [PATCH 4/4] isa: Remove the ISA_BUS Kconfig option Date: Mon, 11 Apr 2016 09:25:54 -0400 Message-Id: X-Mailer: git-send-email 2.7.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The introduction of the ISA_BUS option blocks the compilation of ISA drivers on non-x86 platforms. The ISA_BUS configuration option should not be necessary if the X86_32 dependency can be decoupled from the ISA configuration option. This patch both removes the ISA_BUS configuration option entirely and removes the X86_32 dependency from the ISA configuration option. Signed-off-by: William Breathitt Gray --- arch/x86/Kconfig | 10 ++-------- drivers/base/Makefile | 2 +- include/linux/isa.h | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index a597798..280e5eb 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2472,16 +2472,8 @@ config ISA_DMA_API Enables ISA-style DMA support for devices requiring such controllers. If unsure, say Y. -config ISA_BUS - bool "ISA bus support" - help - Enables ISA bus support for devices requiring such controllers. - -if X86_32 - config ISA bool "ISA support" - depends on ISA_BUS ---help--- Find out whether you have ISA slots on your motherboard. ISA is the name of a bus system, i.e. the way the CPU talks to the other stuff @@ -2489,6 +2481,8 @@ config ISA (MCA) or VESA. ISA is an older system, now being displaced by PCI; newer boards don't support it. If you have ISA, say Y, otherwise N. +if X86_32 + config EISA bool "EISA support" depends on ISA diff --git a/drivers/base/Makefile b/drivers/base/Makefile index 4ebfb81..6b2a84e 100644 --- a/drivers/base/Makefile +++ b/drivers/base/Makefile @@ -10,7 +10,7 @@ obj-$(CONFIG_DMA_CMA) += dma-contiguous.o obj-y += power/ obj-$(CONFIG_HAS_DMA) += dma-mapping.o obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o -obj-$(CONFIG_ISA_BUS) += isa.o +obj-$(CONFIG_ISA) += isa.o obj-$(CONFIG_FW_LOADER) += firmware_class.o obj-$(CONFIG_NUMA) += node.o obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o diff --git a/include/linux/isa.h b/include/linux/isa.h index 2a02862..b0270e3 100644 --- a/include/linux/isa.h +++ b/include/linux/isa.h @@ -22,7 +22,7 @@ struct isa_driver { #define to_isa_driver(x) container_of((x), struct isa_driver, driver) -#ifdef CONFIG_ISA_BUS +#ifdef CONFIG_ISA int isa_register_driver(struct isa_driver *, unsigned int); void isa_unregister_driver(struct isa_driver *); #else