From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Jan 2012 18:19:17 +0000 (-0800)
Subject: Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
X-Git-Url: https://git.openfabrics.org/?p=~shefty%2Frdma-dev.git;a=commitdiff_plain;h=abce00f962a11ed6f748c2569e11695a30716b53;hp=-c

Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev

* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
  ahci: support the STA2X11 I/O Hub
  pata_bf54x: fix BMIDE status register emulation
  ata: add ata port hibernate callbacks
  ata: update ata port's runtime status during system resume
  [SCSI] runtime resume parent for child's system-resume
  ahci: platform support for suspend/resume
  libata-core: kill duplicate statement in ata_do_set_mode()
  pata_of_platform: remove direct dependency on OF_IRQ
  SATA/PATA: convert drivers/ata/* to use module_platform_driver()
  pata_cs5536: forward port changes from cs5536
  libata-sff: use ATAPI_{COD|IO}
  ata: add ata port runtime PM callbacks
  ata: add ata port system PM callbacks
  [SCSI] sd: check runtime PM status in sd_shutdown
  [SCSI] check runtime PM status in system PM
  [SCSI] add flag to skip the runtime PM calls on the host
  ata: make ata port as parent device of scsi host
  ahci: start engine only during soft/hard resets
---

abce00f962a11ed6f748c2569e11695a30716b53
diff --combined drivers/ata/pata_at91.c
index 5249e6d918a,d56dd45adf2..a7d91a72ee3
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@@ -360,7 -360,7 +360,7 @@@ static int __devinit pata_at91_probe(st
  	ap->flags |= ATA_FLAG_SLAVE_POSS;
  	ap->pio_mask = ATA_PIO4;
  
 -	if (!irq) {
 +	if (!gpio_is_valid(irq)) {
  		ap->flags |= ATA_FLAG_PIO_POLLING;
  		ata_port_desc(ap, "no IRQ, using PIO polling");
  	}
@@@ -414,8 -414,8 +414,8 @@@
  
  	host->private_data = info;
  
 -	ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
 -			irq ? ata_sff_interrupt : NULL,
 +	return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
 +			gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
  			irq_flags, &pata_at91_sht);
  
  	if (!ret)
@@@ -454,20 -454,7 +454,7 @@@ static struct platform_driver pata_at91
  	},
  };
  
- static int __init pata_at91_init(void)
- {
- 	return platform_driver_register(&pata_at91_driver);
- }
- 
- static void __exit pata_at91_exit(void)
- {
- 	platform_driver_unregister(&pata_at91_driver);
- }
- 
- 
- module_init(pata_at91_init);
- module_exit(pata_at91_exit);
- 
+ module_platform_driver(pata_at91_driver);
  
  MODULE_LICENSE("GPL");
  MODULE_DESCRIPTION("Driver for CF in True IDE mode on AT91SAM9260 SoC");