From nobody Tue Sep 16 10:31:55 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 523BFC3DA7D for ; Thu, 5 Jan 2023 13:48:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233092AbjAENsC (ORCPT ); Thu, 5 Jan 2023 08:48:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60672 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231823AbjAENrR (ORCPT ); Thu, 5 Jan 2023 08:47:17 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E26C7392DE for ; Thu, 5 Jan 2023 05:47:16 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 7E1D361A8A for ; Thu, 5 Jan 2023 13:47:16 +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 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 =20 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 =20 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) +=3D max1600.o =20 sa1111_cs-y +=3D sa1111_generic.o sa1111_cs-$(CONFIG_ASSABET_NEPONSET) +=3D sa1111_neponset.o -sa1111_cs-$(CONFIG_SA1100_BADGE4) +=3D sa1111_badge4.o sa1111_cs-$(CONFIG_SA1100_JORNADA720) +=3D sa1111_jornada720.o -sa1111_cs-$(CONFIG_ARCH_LUBBOCK) +=3D sa1111_lubbock.o =20 sa1100_cs-y +=3D sa1100_generic.o sa1100_cs-$(CONFIG_SA1100_COLLIE) +=3D pxa2xx_sharpsl.o -sa1100_cs-$(CONFIG_SA1100_H3100) +=3D sa1100_h3600.o sa1100_cs-$(CONFIG_SA1100_H3600) +=3D sa1100_h3600.o -sa1100_cs-$(CONFIG_SA1100_SIMPAD) +=3D sa1100_simpad.o =20 -pxa2xx-obj-$(CONFIG_MACH_MAINSTONE) +=3D pxa2xx_mainstone.o pxa2xx-obj-$(CONFIG_PXA_SHARPSL) +=3D pxa2xx_sharpsl.o obj-$(CONFIG_PCMCIA_PXA2XX) +=3D pxa2xx_base.o $(pxa2xx-obj-y) obj-$(CONFIG_PCMCIA_XXS1500) +=3D xxs1500_ss.o diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_main= stone.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_lubboc= k.c deleted file mode 100644 index f1b5160cb8fa..000000000000 --=20 2.39.0