aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2008-04-07 09:47:22 -0400
committerJeff Garzik <jgarzik@redhat.com>2008-04-17 15:44:25 -0400
commit88fcd5627563722483427a55113c0a83f56e8080 (patch)
tree6a596e33d6497fbed58147e8fdb59b611d956c12 /drivers
parent071f44b1d2c051641b62a3571223314737ccbe59 (diff)
libata: make PMP support optional
Make PMP support optional by adding CONFIG_SATA_PMP and leaving out libata-pmp.c if it isn't set. PMP helpers return constant values if PMP support is not enabled and PMP declarations alias non-PMP counterparts. This makes the compiler to leave out PMP related part out and LLDs to use non-PMP counterparts automatically. Signed-off-by: Tejun Heo <htejun@gmail.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/Kconfig6
-rw-r--r--drivers/ata/Makefile3
-rw-r--r--drivers/ata/libata.h17
3 files changed, 25 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 48c8fc55391e..3eb6035b61b8 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -41,6 +41,12 @@ config ATA_ACPI
41 You can disable this at kernel boot time by using the 41 You can disable this at kernel boot time by using the
42 option libata.noacpi=1 42 option libata.noacpi=1
43 43
44config SATA_PMP
45 bool "SATA Port Multiplier support"
46 default y
47 help
48 This option adds support for SATA Port Multipliers.
49
44config SATA_AHCI 50config SATA_AHCI
45 tristate "AHCI SATA support" 51 tristate "AHCI SATA support"
46 depends on PCI 52 depends on PCI
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index e6e41b2c731c..1fbc2aa648b7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -78,6 +78,7 @@ obj-$(CONFIG_ATA_GENERIC) += ata_generic.o
78# Should be last libata driver 78# Should be last libata driver
79obj-$(CONFIG_PATA_LEGACY) += pata_legacy.o 79obj-$(CONFIG_PATA_LEGACY) += pata_legacy.o
80 80
81libata-objs := libata-core.o libata-scsi.o libata-eh.o libata-pmp.o 81libata-objs := libata-core.o libata-scsi.o libata-eh.o
82libata-$(CONFIG_ATA_SFF) += libata-sff.o 82libata-$(CONFIG_ATA_SFF) += libata-sff.o
83libata-$(CONFIG_SATA_PMP) += libata-pmp.o
83libata-$(CONFIG_ATA_ACPI) += libata-acpi.o 84libata-$(CONFIG_ATA_ACPI) += libata-acpi.o
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
index 42b30e38495d..4aeeabb10a47 100644
--- a/drivers/ata/libata.h
+++ b/drivers/ata/libata.h
@@ -203,9 +203,26 @@ extern int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset,
203extern void ata_eh_finish(struct ata_port *ap); 203extern void ata_eh_finish(struct ata_port *ap);
204 204
205/* libata-pmp.c */ 205/* libata-pmp.c */
206#ifdef CONFIG_SATA_PMP
206extern int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *val); 207extern int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *val);
207extern int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val); 208extern int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val);
208extern int sata_pmp_attach(struct ata_device *dev); 209extern int sata_pmp_attach(struct ata_device *dev);
210#else /* CONFIG_SATA_PMP */
211static inline int sata_pmp_scr_read(struct ata_link *link, int reg, u32 *val)
212{
213 return -EINVAL;
214}
215
216static inline int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val)
217{
218 return -EINVAL;
219}
220
221static inline int sata_pmp_attach(struct ata_device *dev)
222{
223 return -EINVAL;
224}
225#endif /* CONFIG_SATA_PMP */
209 226
210/* libata-sff.c */ 227/* libata-sff.c */
211#ifdef CONFIG_ATA_SFF 228#ifdef CONFIG_ATA_SFF