2006-09-26 16:33:19

by Alan

Subject: [PATCH] libata-sff: use our IRQ defines

Signed-off-by: Alan Cox <[email protected]>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.18-mm1/drivers/ata/libata-sff.c linux-2.6.18-mm1/drivers/ata/libata-sff.c
--- linux.vanilla-2.6.18-mm1/drivers/ata/libata-sff.c 2006-09-25 12:10:08.000000000 +0100
+++ linux-2.6.18-mm1/drivers/ata/libata-sff.c 2006-09-25 16:04:41.000000000 +0100
@@ -881,7 +881,7 @@
probe_ent->private_data = port[0]->private_data;

if (port_mask & ATA_PORT_PRIMARY) {
- probe_ent->irq = 14;
+ probe_ent->irq = ATA_PRIMARY_IRQ;
probe_ent->port[0].cmd_addr = ATA_PRIMARY_CMD;
probe_ent->port[0].altstatus_addr =
probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL;
@@ -896,7 +896,7 @@

if (port_mask & ATA_PORT_SECONDARY) {
if (probe_ent->irq)
- probe_ent->irq2 = 15;
+ probe_ent->irq2 = ATA_SECONDARY_IRQ;
else
probe_ent->irq = 15;
probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;

2006-09-26 17:35:51

by Jeff Garzik

Subject: Re: [PATCH] libata-sff: use our IRQ defines

Alan Cox wrote:
> Signed-off-by: Alan Cox <[email protected]>

applied

2006-09-26 20:44:37

by Olivier Galibert

Subject: Re: [PATCH] libata-sff: use our IRQ defines

On Tue, Sep 26, 2006 at 05:55:37PM +0100, Alan Cox wrote:
> Signed-off-by: Alan Cox <[email protected]>
>
> diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.18-mm1/drivers/ata/libata-sff.c linux-2.6.18-mm1/drivers/ata/libata-sff.c
> --- linux.vanilla-2.6.18-mm1/drivers/ata/libata-sff.c 2006-09-25 12:10:08.000000000 +0100
> +++ linux-2.6.18-mm1/drivers/ata/libata-sff.c 2006-09-25 16:04:41.000000000 +0100
> @@ -881,7 +881,7 @@
> probe_ent->private_data = port[0]->private_data;
>
> if (port_mask & ATA_PORT_PRIMARY) {
> - probe_ent->irq = 14;
> + probe_ent->irq = ATA_PRIMARY_IRQ;
> probe_ent->port[0].cmd_addr = ATA_PRIMARY_CMD;
> probe_ent->port[0].altstatus_addr =
> probe_ent->port[0].ctl_addr = ATA_PRIMARY_CTL;
> @@ -896,7 +896,7 @@
>
> if (port_mask & ATA_PORT_SECONDARY) {
> if (probe_ent->irq)
> - probe_ent->irq2 = 15;
> + probe_ent->irq2 = ATA_SECONDARY_IRQ;
> else
> probe_ent->irq = 15;

Isn't that one supposed to be ATA_SECONDARY_IRQ too?

> probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;
>

OG.

2006-09-26 20:55:12

by Alan

Subject: Re: [PATCH] libata-sff: use our IRQ defines

Ar Maw, 2006-09-26 am 22:44 +0200, ysgrifennodd Olivier Galibert:
> > if (probe_ent->irq)
> > - probe_ent->irq2 = 15;
> > + probe_ent->irq2 = ATA_SECONDARY_IRQ;
> > else
> > probe_ent->irq = 15;
>
> Isn't that one supposed to be ATA_SECONDARY_IRQ too?
>
> > probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;

Duh yes...

(adds another paper bag to the pile)

2006-09-26 21:25:52

by Jeff Garzik

Subject: Re: [PATCH] libata-sff: use our IRQ defines

Alan Cox wrote:
> Ar Maw, 2006-09-26 am 22:44 +0200, ysgrifennodd Olivier Galibert:
>>> if (probe_ent->irq)
>>> - probe_ent->irq2 = 15;
>>> + probe_ent->irq2 = ATA_SECONDARY_IRQ;
>>> else
>>> probe_ent->irq = 15;
>> Isn't that one supposed to be ATA_SECONDARY_IRQ too?
>>
>>> probe_ent->port[1].cmd_addr = ATA_SECONDARY_CMD;
>
> Duh yes...
>
> (adds another paper bag to the pile)

committed obvious fix...