ata: pata_platform: Merge pata_of_platform into pata_platform

Merge the OF pata_of_platform driver into pata_platform. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
0day-ci · Dec 17, 2021 · 2afb31eaebf47bea2adaec197e8aa25744c15bf6 · 2afb31e
1 parent f81fa16
commit 2afb31eaebf47bea2adaec197e8aa25744c15bf6
Show file tree

Hide file tree

Showing 5 changed files with 153 additions and 149 deletions.
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
@@ -1122,7 +1122,8 @@ config PATA_PLATFORM
 
 config PATA_OF_PLATFORM
 	tristate "OpenFirmware platform device PATA support"
-	depends on PATA_PLATFORM && OF
+	depends on OF
+	select PATA_PLATFORM
 	help
 	  This option enables support for generic directly connected ATA
 	  devices commonly found on embedded systems with OpenFirmware

diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
@@ -107,7 +107,6 @@ obj-$(CONFIG_PATA_OPTI)		+= pata_opti.o
 obj-$(CONFIG_PATA_PCMCIA)	+= pata_pcmcia.o
 obj-$(CONFIG_PATA_PALMLD)	+= pata_palmld.o
 obj-$(CONFIG_PATA_PLATFORM)	+= pata_platform.o
-obj-$(CONFIG_PATA_OF_PLATFORM)	+= pata_of_platform.o
 obj-$(CONFIG_PATA_RB532)	+= pata_rb532_cf.o
 obj-$(CONFIG_PATA_RZ1000)	+= pata_rz1000.o
 obj-$(CONFIG_PATA_SAMSUNG_CF)	+= pata_samsung_cf.o

diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c