From 5ca01b75534f35d6fcb2f6a64bc6f3c9b8490411 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Fri, 15 Jun 2007 17:45:49 +0800 Subject: [PATCH] --- yaml --- r: 58708 b: refs/heads/master c: 5f45bc50976ee1f408f7171af155aec646655a37 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/ata/pata_platform.c | 6 ++++-- trunk/include/linux/pata_platform.h | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd98e0a3a5ce..c394d433c851 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d0e580316e3db9f5cf6a605cc311ffb0372f0a35 +refs/heads/master: 5f45bc50976ee1f408f7171af155aec646655a37 diff --git a/trunk/drivers/ata/pata_platform.c b/trunk/drivers/ata/pata_platform.c index cbb7866940d6..79f841bca593 100644 --- a/trunk/drivers/ata/pata_platform.c +++ b/trunk/drivers/ata/pata_platform.c @@ -139,6 +139,7 @@ static int __devinit pata_platform_probe(struct platform_device *pdev) struct resource *io_res, *ctl_res; struct ata_host *host; struct ata_port *ap; + struct pata_platform_info *pp_info; unsigned int mmio; /* @@ -208,11 +209,12 @@ static int __devinit pata_platform_probe(struct platform_device *pdev) ap->ioaddr.altstatus_addr = ap->ioaddr.ctl_addr; - pata_platform_setup_port(&ap->ioaddr, pdev->dev.platform_data); + pp_info = (struct pata_platform_info *)(pdev->dev.platform_data); + pata_platform_setup_port(&ap->ioaddr, pp_info); /* activate */ return ata_host_activate(host, platform_get_irq(pdev, 0), ata_interrupt, - 0, &pata_platform_sht); + pp_info->irq_flags, &pata_platform_sht); } /** diff --git a/trunk/include/linux/pata_platform.h b/trunk/include/linux/pata_platform.h index 2d5fd647e0e9..5799e8d50623 100644 --- a/trunk/include/linux/pata_platform.h +++ b/trunk/include/linux/pata_platform.h @@ -8,6 +8,11 @@ struct pata_platform_info { * spacing used by ata_std_ports(). */ unsigned int ioport_shift; + /* + * Indicate platform specific irq types and initial + * IRQ flags when call request_irq() + */ + unsigned int irq_flags; }; #endif /* __LINUX_PATA_PLATFORM_H */