From patchwork Mon Jul 11 12:02:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 12913439 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 4A28AC433EF for ; Mon, 11 Jul 2022 12:03:53 +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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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:In-Reply-To:References: List-Owner; bh=QPDUx2Ky/Gx22B5EjW86ARdOXAJxQ0I8bPyjgwOD3vY=; b=rASKag7M+jzUc9 mxR6PiJB1QvPti8f9bDrIXs3hbl0jjmZVStGFQ3DptsOt5fCLiDMC/EWUlCwwSBrD4Qra++DqQbxx stNBp49GnkC2KU1Tad/vgR6xjm9S0z5IO/pIgIqi8hZJz5z11+vk6l1TmZ5NSTcbYi1Yec4ugGS36 4HANhmCJDcInJC6ZFZN1J6sD/Et1m3MyhUE+2Mfqs3YHpWpESL48OdvdyZRI3QMsHeXK2wjS9/9KM wp7AA2xMlHutLQRL2XDOrhGgH0+rImfwpaAayiqYr9JgtINM/MvcTlJObjbCIgZ/U1rX2X82BuIb/ ufh/9kmQsvkAVJVPe1+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAs7j-001GJm-7Q; Mon, 11 Jul 2022 12:02:47 +0000 Received: from mail-ed1-x531.google.com ([2a00:1450:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oAs7f-001GGR-Po for linux-arm-kernel@lists.infradead.org; Mon, 11 Jul 2022 12:02:45 +0000 Received: by mail-ed1-x531.google.com with SMTP id w12so5200081edd.13 for ; Mon, 11 Jul 2022 05:02:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=BWPy1/wLCTu6ilQ4qUtHXwXwf7Z3gLlHQb6cz3/Ocik=; b=Km4YSWpymZHkGx1rK7YmaWp5bO7T4ldo5feo4/eotjCLPx0cA4uhJ7EFb+nHLoMc0z n8a8f6Sd0JTo4jq+fK7He9B0gtwTn0AfeNcEpUHCkdozbEmU1gSBLDGkrZzehRLd4XSR HaM1NjnsXectLRiGhKY1Wd2EZOJznd3w2/v2zSlwUgtUZ3/ODINZUOi9XUpQxWUPgGIO YUxQH4CI6H/cSxO7DydgPsEVvvf6UN1B/8mh2tfxWuS+3XJFIJHdmoRLyYwSRL8HZ3Hc 3A4KhZpWMItX33PeoMcCpKDbJjw7vONygOQag9qg7V91/nwFbdBJnNgqxqJ9yqAycdlF SQbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=BWPy1/wLCTu6ilQ4qUtHXwXwf7Z3gLlHQb6cz3/Ocik=; b=MqxIOblUzZU8RNcXRz3e0WCJMSFePRb5lyu075PFASojX0o3uXMapiMudbeRTCRHIE yg+pGp4Vlx6n4yMXMsZlLqnyT8m/w9T0Gq71PMn7NRKEj5FdVlvjVvtWdYwVGSHtni83 mHeakz1eHf/PLaKQpUv0Q/aL8O5ayuHazXV+MQyYBRYGSakCFO5dTyRNMrxJVirlEzJc 3IMoZyzKtugVWfpmyLnIHoO44cp5z2YIDSeOedrd2UoifSmGq6KgGuFTGjoXftMXEbZP QYjbaZLQtX4k7T1AGY6BNjPGn519+maLXu1sQ9p4uc2vKlbBhfZvEEUM1XwqCdRm490W mhWg== X-Gm-Message-State: AJIora8gqzBS7fF6wTaDMJjbrpmkAQr3ZLo+UULMdB1PZfFP1sScvJyJ 0ReVQZbs0GT4JCYonYL8VME= X-Google-Smtp-Source: AGRyM1ve4fGvpX//Ha5C48qcrSCWGYrkCUCqWsQMWsnGm5i1oa0340q2eUVYe7/+FksBdB/Z3Ta2eQ== X-Received: by 2002:a05:6402:84f:b0:437:6293:d264 with SMTP id b15-20020a056402084f00b004376293d264mr23916942edz.317.1657540960468; Mon, 11 Jul 2022 05:02:40 -0700 (PDT) Received: from felia.fritz.box (200116b8266e42009c70ae84c5cabc2b.dip.versatel-1u1.de. [2001:16b8:266e:4200:9c70:ae84:c5ca:bc2b]) by smtp.gmail.com with ESMTPSA id hx24-20020a170906847800b00722fadc4279sm2608036ejc.124.2022.07.11.05.02.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jul 2022 05:02:39 -0700 (PDT) From: Lukas Bulwahn To: Sekhar Nori , Bartosz Golaszewski , Russell King , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Arnd Bergmann , kernel-janitors@vger.kernel.org, Lukas Bulwahn Subject: [PATCH SECOND RESEND] arm: davinci: remove reference to obsolete BLK_DEV_PALMCHIP_BK3710 Date: Mon, 11 Jul 2022 14:02:29 +0200 Message-Id: <20220711120229.30806-1-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220711_050243_892525_37143AED X-CRM114-Status: GOOD ( 13.48 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit b7fb14d3ac63 ("ide: remove the legacy ide driver") removes the definition of the config BLK_DEV_PALMCHIP_BK3710. So, remove the obsolete references in the mach-davinci architecture. Signed-off-by: Lukas Bulwahn Reviewed-by: Arnd Bergmann --- first send: https://lore.kernel.org/linux-arm-kernel/20210804123426.16947-3-lukas.bulwahn@gmail.com/ first resend: https://lore.kernel.org/linux-arm-kernel/20211011063624.12269-2-lukas.bulwahn@gmail.com/ another resend (as part of a larger series): https://lore.kernel.org/linux-arm-kernel/20211028141938.3530-6-lukas.bulwahn@gmail.com/ addition now in second resend: - added Arnd's Reviewed-by tag from https://lore.kernel.org/linux-arm-kernel/CAK8P3a2GGbik3r5BCKE2ZCkpFyzv8Q54z_iV84ZJ+kNXYUTMzw@mail.gmail.com/ arch/arm/mach-davinci/board-dm644x-evm.c | 3 +-- arch/arm/mach-davinci/board-dm646x-evm.c | 3 +-- arch/arm/mach-davinci/board-neuros-osd2.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index ebdd5c334ac1..4cde283f7f03 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -828,8 +828,7 @@ static int davinci_phy_fixup(struct phy_device *phydev) return 0; } -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NOR IS_ENABLED(CONFIG_MTD_PHYSMAP) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index 28861fee493b..151e246c99b8 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -146,8 +146,7 @@ static struct platform_device davinci_aemif_device = { .num_resources = ARRAY_SIZE(davinci_aemif_resources), }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #ifdef CONFIG_I2C /* CPLD Register 0 bits to control ATA */ diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index 9748a2c12cc4..3b2298d686d5 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -160,8 +160,7 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { .wires = 4, }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NAND IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)