diff options
author | Tejun Heo <tj@kernel.org> | 2010-05-10 15:41:29 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2010-05-14 22:38:46 -0400 |
commit | c7a8209f766961eea4cfc6f22d2d6e06ef63546c (patch) | |
tree | 63b3b2ee55942218c6c155a56c40e86d99e223ea /drivers/ata | |
parent | 2a7adff09ac3dd3d1facaf92b4a8cc1b92d370b6 (diff) |
libata-sff: kill unused prototype and make ata_dev_select() static
ata_irq_on() was renamed to ata_sff_irq_on() and exported a while ago
but prototype for the original function lingered in
drivers/ata/libata.h. Kill it. Also, ata_dev_select() is only used
inside drivers/ata/libata-sff.c. Make it static.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r-- | drivers/ata/libata-sff.c | 2 | ||||
-rw-r--r-- | drivers/ata/libata.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index a4700af43d10..d5dd88d6dea0 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
@@ -511,7 +511,7 @@ EXPORT_SYMBOL_GPL(ata_sff_dev_select); | |||
511 | * LOCKING: | 511 | * LOCKING: |
512 | * caller. | 512 | * caller. |
513 | */ | 513 | */ |
514 | void ata_dev_select(struct ata_port *ap, unsigned int device, | 514 | static void ata_dev_select(struct ata_port *ap, unsigned int device, |
515 | unsigned int wait, unsigned int can_sleep) | 515 | unsigned int wait, unsigned int can_sleep) |
516 | { | 516 | { |
517 | if (ata_msg_probe(ap)) | 517 | if (ata_msg_probe(ap)) |
diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h index 823e63096362..132da80aa23a 100644 --- a/drivers/ata/libata.h +++ b/drivers/ata/libata.h | |||
@@ -202,9 +202,6 @@ static inline int sata_pmp_attach(struct ata_device *dev) | |||
202 | 202 | ||
203 | /* libata-sff.c */ | 203 | /* libata-sff.c */ |
204 | #ifdef CONFIG_ATA_SFF | 204 | #ifdef CONFIG_ATA_SFF |
205 | extern void ata_dev_select(struct ata_port *ap, unsigned int device, | ||
206 | unsigned int wait, unsigned int can_sleep); | ||
207 | extern u8 ata_irq_on(struct ata_port *ap); | ||
208 | extern void ata_pio_task(struct work_struct *work); | 205 | extern void ata_pio_task(struct work_struct *work); |
209 | #endif /* CONFIG_ATA_SFF */ | 206 | #endif /* CONFIG_ATA_SFF */ |
210 | 207 | ||