Patchwork libata: kill ata_irq_on() prototype

login
register
mail settings
Submitter Sergei Shtylyov
Date May 6, 2010, 6:15 p.m.
Message ID <201005062215.22697.sshtylyov@ru.mvista.com>
Download mbox | patch
Permalink /patch/51858/
State Not Applicable
Delegated to: David Miller
Headers show

Comments

Sergei Shtylyov - May 6, 2010, 6:15 p.m.
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...

Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>

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

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

--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - May 14, 2010, 9:24 p.m.
On 05/06/2010 02:15 PM, Sergei Shtylyov wrote:
> 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...
>
> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com>
>
> ---
> The patch is against the recent Linus' tree.
>
>   drivers/ata/libata.h |    1 -
>   1 file changed, 1 deletion(-)

applied


--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Sergei Shtylyov - May 14, 2010, 9:29 p.m.
Hello.

Jeff Garzik wrote:

>> 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...

>> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com>

>> ---
>> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Garzik - May 14, 2010, 9:36 p.m.
On 05/14/2010 05:29 PM, Sergei Shtylyov wrote:
> Hello.
>
> Jeff Garzik wrote:
>
>>> 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...
>
>>> Signed-off-by: Sergei Shtylyov<sshtylyov@ru.mvista.com>
>
>>> ---
>>> 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.

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

	Jeff




--
To unsubscribe from this list: send the line "unsubscribe linux-ide" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

Index: linux-2.6/drivers/ata/libata.h
===================================================================
--- linux-2.6.orig/drivers/ata/libata.h
+++ 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 */