More (hopefully final) Kconfig clean-up after IDE removal
Subsystems (5)
cover More (hopefully final) Kconfig clean-up after IDE removal
Dear Christoph, dear Jens,
here is a follow-up to the issue of Kconfig references to obsolete IDE configs, which I first identified and addressed in commit 094121ef815f ("arch: Kconfig:
clean up obsolete use of HAVE_IDE").
Following checkkconfigsymbols.py indications, this patch series cleans up all references to removed IDE Kconfig symbol throughout the current kernel tree.
Pavel, Sekhar, Bartosz, you are CCed, just to let know about minor follow-up cleanup in your files.
Christoph, please review and ack.
Jens, please pick these two further clean-up patches.
Best regards,
Lukas
Lukas Bulwahn (2):
leds: trigger: remove reference to obsolete CONFIG_IDE_GD_ATA
arm: davinci: remove reference to obsolete BLK_DEV_PALMCHIP_BK3710
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 +-- drivers/leds/trigger/Kconfig | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/2 leds: trigger: remove reference to obsolete CONFIG_IDE_GD_ATA
Commit b7fb14d3ac63 ("ide: remove the legacy ide driver") removes the definition of the config IDE_GD_ATA.
So, remove the obsolete reference in ./drivers/leds/trigger/Kconfig.
--- drivers/leds/trigger/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/trigger/Kconfig +1 -1
@@ -34,7 +34,7 @@ config LEDS_TRIGGER_ONESHOT config LEDS_TRIGGER_DISK bool "LED Disk Trigger" - depends on IDE_GD_ATA || ATA + depends on ATA help This allows LEDs to be controlled by disk activity. If unsure, say Y.
Signature · 1 line
2.17.1
Pavel Machek
AppliedRe: [PATCH 1/2] leds: trigger: remove reference to obsolete CONFIG_IDE_GD_ATA
Quoted 6 lines · Lukas Bulwahn
Commit
b7fb14d3ac63("ide: remove the legacy ide driver") removes the definition of the configIDE_GD_ATA.So, remove the obsolete reference in
./drivers/leds/trigger/Kconfig.Signed-off-by Lukas Bulwahn <[email protected]>
Thanks, applied.
Pavel
Signature · 1 line
http://www.livejournal.com/~pavelmachek
PATCH 2/2 arm: davinci: remove reference to obsolete BLK_DEV_PALMCHIP_BK3710
In reply to Lukas BulwahnCommit 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.
--- 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(-)
arch/arm/mach-davinci/board-dm644x-evm.c +1 -2
@@ -834,8 +834,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)
arch/arm/mach-davinci/board-dm646x-evm.c +1 -2
@@ -151,8 +151,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 */
arch/arm/mach-davinci/board-neuros-osd2.c +1 -2
@@ -164,8 +164,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)
Signature · 1 line
2.17.1