Skip to contentSkip to conversation

libata: kill ata_irq_on() prototype

PATCH Applied Sergei Shtylyov 3 participants 4 messages May 6, 2010 – May 14, 2010 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libata: kill ata_irq_on() prototype

Commit 9363c3825ea9ad76561eb48a395349dd29211ed6 renamed ata_irq_on() to ata_sff_irq_on() but forgot to rename its prototype in "libata.h". This prototype is duplicate anyway, as the function is already declared in <linux/libata.h>, so remove it...

---
The patch is against the recent Linus' tree.

 drivers/ata/libata.h |    1 -
 1 file changed, 1 deletion(-)
drivers/ata/libata.h +0 -1
Index: linux-2.6/drivers/ata/libata.h
===================================================================
@@ -204,7 +204,6 @@ static inline int sata_pmp_attach(struct
 #ifdef CONFIG_ATA_SFF
 extern void ata_dev_select(struct ata_port *ap, unsigned int device,
                            unsigned int wait, unsigned int can_sleep);
-extern u8 ata_irq_on(struct ata_port *ap);
 extern void ata_pio_task(struct work_struct *work);
 #endif /* CONFIG_ATA_SFF */
 
Applied
#1 lore raw
Quoted 5 lines · Sergei Shtylyov

Commit 9363c3825ea9ad76561eb48a395349dd29211ed6 renamed ata_irq_on() to ata_sff_irq_on() but forgot to rename its prototype in "libata.h". This prototype is duplicate anyway, as the function is already declared in <linux/libata.h>, so remove it...

Quoted 7 lines

---
The patch is against the recent Linus' tree.

  drivers/ata/libata.h |    1 -
  1 file changed, 1 deletion(-)

applied

#2 lore raw

Hello.

Quoted 7 lines · Jeff Garzik
Quoted 6 lines

Commit 9363c3825ea9ad76561eb48a395349dd29211ed6 renamed ata_irq_on() to ata_sff_irq_on() but forgot to rename its prototype in "libata.h". This prototype is duplicate anyway, as the function is already declared in <linux/libata.h>, so remove it...

Quoted 7 lines
Quoted 5 lines

---
The patch is against the recent Linus' tree.

  drivers/ata/libata.h |    1 -
  1 file changed, 1 deletion(-)

applied

Jeff, this patch conflicts with Tejun's recently posted patch:

http://marc.info/?l=linux-ide&m=127352053709702

It would probably have been better to apply Tejun's patch as more
complete.

MBR, Sergei

#3 lore raw
Quoted 17 lines · Sergei Shtylyov

Hello.

Quoted 12 lines · Jeff Garzik
Quoted 12 lines

Commit 9363c3825ea9ad76561eb48a395349dd29211ed6 renamed ata_irq_on() to ata_sff_irq_on() but forgot to rename its prototype in "libata.h". This prototype is duplicate anyway, as the function is already declared in <linux/libata.h>, so remove it...

---
The patch is against the recent Linus' tree.

drivers/ata/libata.h | 1 -

1 file changed, 1 deletion(-)
Quoted 7 lines
Quoted 1 line

applied

Jeff, this patch conflicts with Tejun's recently posted patch:

http://marc.info/?l=linux-ide&m=127352053709702

It would probably have been better to apply Tejun's patch as more complete.

So noted, patch dropped. I was about to turn to Tejun's pile-o-stuff, and this saved me a bit of time.

Jeff