From patchwork Thu Jan 5 13:46:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 13090659 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1855DC3DA7A for ; Thu, 5 Jan 2023 22:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=R7osa8fIH+d8+4+K/0GH1cOeZMhiUbJevtf4vM9rtfg=; b=Y+dbLNvxZJTpV6 yQ7gnH7oZVTEnUJtcKUf56/cz3RFO5OWIl7UBwPDQqkeF5M/55y5VUJR0X7Gffr1VKzoBhOn8c3LJ nCztoE/uw9CbGMTzUEcbxN1tAELf3OKoH1qqtt2KzAyxvzEuazqLCmonVAD2ThAqrALL3DlVCTSIe bVN6Ahaqmg5IbpV6rqNjbvDpqn7q3Qx1tWZg4RaUOv/CIYiMii5DYhrNnIuwxf/BluPWTS78lHDjZ 1a2YIrsuIe3Zn0NdNJbHRQyJ7JOV49805K6s6X4BU4pJ88IpVES5OBjYfl+zj8fOl2rC71XM1OsR3 OlAf/u5ffO7LnyM9xppQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDZBY-00Frfy-Ua; Thu, 05 Jan 2023 22:58:09 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pDVQG-00DtJ6-4X for linux-arm-kernel@bombadil.infradead.org; Thu, 05 Jan 2023 18:57:04 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=spXzsa/K59tTk3FHS5f5/ztxP8CqdRQPkdmCzgXPot8=; b=RLbKyUjYKQ55eRk95VutfyeYox OyFo8NiOxiVV2ozTTw2aexUqRK4W5dG+oOtbZXULy1hw9MC01QdyG1U3gZJn8GBIZcyOLV4MifwmM TDoqOy1t/am0Fxo1nmbixgToAduLt6rOtzM+GdDcNnsmMlL+IpH7WD2tc7gBzuV1E+AO0YgN3bCUX /yOZ6tiMwBCp7dnCwZr/MItIH2IggRBd8uxVlTD5QIUSALgYLLIRADM7CW7hmvUx/jhASCuIO+Efo KV4co2IeaPGh+GFcbuDJwUEjMissCdG/5ZeH7Dny6L1zsTrlO1xnGmg3wVt8GuGcjr4JiBDP5x3yW BDGC/ZYQ==; Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by desiato.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1pDQaN-001M30-2y for linux-arm-kernel@lists.infradead.org; Thu, 05 Jan 2023 13:47:13 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 3F807B81AE2; Thu, 5 Jan 2023 13:47:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 47080C433F1; Thu, 5 Jan 2023 13:47:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1672926435; bh=hn3HISdXEY51xtvJzrgO8TbVIWPbUwezVx/zrFwoZfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OOu0etm9SyEPsON530cLE3M9D98J3SXv/oR6KUshtU9XE18FvozfgoE70ywh2tbUv pz2z0yAokfqjdCZ/WxKmHbcIOhCjVr0ZaGz5uAWYNWIoJ6pgRq+348PUoX20nTJxYc IfeZtuZBRUEDGNbImoRFZ3LLnR2M3RJuYA7s+zLC4fPuIORSSI9bhHrDUBtdLsutu6 1cpoVtEJQxCmcUzLr7cA2qIrcXm+HIVgQY9NynVYJ9qqJ+/AoZdBKpKg2Chw0PyjVm ZVLKmE1pjRpXjzk9Mmz5HDcB3wF1CndfduKTM5FPC3wmYSCfwYF2Hkwu2DZNP3N/7R Yn4LhhgsSdrvQ== From: Arnd Bergmann To: Robert Jarzmik Cc: Daniel Mack , Haojian Zhuang , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Arnd Bergmann , Dominik Brodowski Subject: [PATCH 13/27] pcmcia: remove unused pxa/sa1100 drivers Date: Thu, 5 Jan 2023 14:46:08 +0100 Message-Id: <20230105134622.254560-14-arnd@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230105134622.254560-1-arnd@kernel.org> References: <20230105134622.254560-1-arnd@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230105_134712_068223_BF9A08AD X-CRM114-Status: GOOD ( 15.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann A number of boards got removed, so this code is now orphaned. Cc: Dominik Brodowski Signed-off-by: Arnd Bergmann --- drivers/pcmcia/Kconfig | 12 +-- drivers/pcmcia/Makefile | 5 - drivers/pcmcia/pxa2xx_mainstone.c | 122 ----------------------- drivers/pcmcia/sa1100_simpad.c | 115 ---------------------- drivers/pcmcia/sa1111_badge4.c | 158 ------------------------------ drivers/pcmcia/sa1111_lubbock.c | 155 ----------------------------- 6 files changed, 2 insertions(+), 565 deletions(-) delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c delete mode 100644 drivers/pcmcia/sa1100_simpad.c delete mode 100644 drivers/pcmcia/sa1111_badge4.c delete mode 100644 drivers/pcmcia/sa1111_lubbock.c diff --git a/drivers/pcmcia/Kconfig b/drivers/pcmcia/Kconfig index 1525023e49b6..44c16508ef14 100644 --- a/drivers/pcmcia/Kconfig +++ b/drivers/pcmcia/Kconfig @@ -194,10 +194,8 @@ config PCMCIA_SA1111 tristate "SA1111 support" depends on ARM && SA1111 && PCMCIA select PCMCIA_SOC_COMMON - select PCMCIA_SA11XX_BASE if ARCH_SA1100 - select PCMCIA_PXA2XX if ARCH_LUBBOCK && SA1111 + select PCMCIA_SA11XX_BASE select PCMCIA_MAX1600 if ASSABET_NEPONSET - select PCMCIA_MAX1600 if ARCH_LUBBOCK && SA1111 help Say Y here to include support for SA1111-based PCMCIA or CF sockets, found on the Jornada 720, Graphicsmaster and other @@ -207,14 +205,8 @@ config PCMCIA_SA1111 config PCMCIA_PXA2XX tristate "PXA2xx support" - depends on ARM && ARCH_PXA && PCMCIA - depends on (ARCH_LUBBOCK || MACH_MAINSTONE || PXA_SHARPSL \ - || ARCH_PXA_PALM || TRIZEPS_PCMCIA \ - || ARCOM_PCMCIA || ARCH_PXA_ESERIES \ - || MACH_VPAC270 || MACH_BALLOON3 || MACH_COLIBRI \ - || MACH_COLIBRI320 || MACH_H4700) + depends on ARM && ARCH_PXA && PCMCIA && PXA_SHARPSL select PCMCIA_SOC_COMMON - select PCMCIA_MAX1600 if MACH_MAINSTONE help Say Y here to include support for the PXA2xx PCMCIA controller diff --git a/drivers/pcmcia/Makefile b/drivers/pcmcia/Makefile index b3a2accf47af..c9d51b150682 100644 --- a/drivers/pcmcia/Makefile +++ b/drivers/pcmcia/Makefile @@ -36,17 +36,12 @@ obj-$(CONFIG_PCMCIA_MAX1600) += max1600.o sa1111_cs-y += sa1111_generic.o sa1111_cs-$(CONFIG_ASSABET_NEPONSET) += sa1111_neponset.o -sa1111_cs-$(CONFIG_SA1100_BADGE4) += sa1111_badge4.o sa1111_cs-$(CONFIG_SA1100_JORNADA720) += sa1111_jornada720.o -sa1111_cs-$(CONFIG_ARCH_LUBBOCK) += sa1111_lubbock.o sa1100_cs-y += sa1100_generic.o sa1100_cs-$(CONFIG_SA1100_COLLIE) += pxa2xx_sharpsl.o -sa1100_cs-$(CONFIG_SA1100_H3100) += sa1100_h3600.o sa1100_cs-$(CONFIG_SA1100_H3600) += sa1100_h3600.o -sa1100_cs-$(CONFIG_SA1100_SIMPAD) += sa1100_simpad.o -pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) += pxa2xx_mainstone.o pxa2xx-obj-$(CONFIG_PXA_SHARPSL) += pxa2xx_sharpsl.o obj-$(CONFIG_PCMCIA_PXA2XX) += pxa2xx_base.o $(pxa2xx-obj-y) obj-$(CONFIG_PCMCIA_XXS1500) += xxs1500_ss.o diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c deleted file mode 100644 index a076e4108452..000000000000 diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c deleted file mode 100644 index 784ada5b8c4f..000000000000 diff --git a/drivers/pcmcia/sa1111_badge4.c b/drivers/pcmcia/sa1111_badge4.c deleted file mode 100644 index e76d5ba921dd..000000000000 diff --git a/drivers/pcmcia/sa1111_lubbock.c b/drivers/pcmcia/sa1111_lubbock.c deleted file mode 100644 index f1b5160cb8fa..000000000000