diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:37:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-15 12:37:18 -0800 |
| commit | c13e69b2f0e1e2da41a175c7e9215659842cbef9 (patch) | |
| tree | e422a97edf4169ced53cab98d700225ae1766759 /drivers/ata/libahci.c | |
| parent | c5258190c2ae664cdf367417a2a25e5fa4104322 (diff) | |
| parent | 72d5f2da2c3717f1be484d97e35d67dde0efb4c0 (diff) | |
Merge tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev
Pull libata updates from Jeff Garzik:
- More ACPI fixes
- ata_piix: cosmetic code movement, re-enable MS Virtual PC support
- generic platform driver improvements; use common code
- pata_cs5536: add quirk for broken udma
- printk prettiness (dev_printk becomes dev_info, etc.)
- sata_promise: fix hardreset lockdep error
- minor cleanups from Sergei Shtylyov
- minor, automated cleanups from Wei Yongjun
- fix null ptr deref bug, in sysfs API
* tag 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: (37 commits)
sata_dwc_460ex: remove file exec bit (chmod 0755 -> 0644)
[libata] fix Null pointer dereference on disk error
ahci: convert ata_link_printk() to ata_link_warn()
pata_imx: convert ata_dev_printk() to ata_dev_info()
ARM: ep93xx: convert ata_<foo>_printk() to ata_<foo>_<level>()
ahci_platform: make structs static
Revert "pata_octeon_cf: perform host detach, removal on exit"
Revert "libata: check SATA_SETTINGS log with HW Feature Ctrl"
pata_of_platform: fix compile error
libata: use pci_get_drvdata() helper
pata_octeon_cf: perform host detach, removal on exit
sata_highbank: utilize common ata_platform_remove_one()
pata_palmld: utilize common ata_platform_remove_one()
pata_platform: remove unused remove function
pata_platform: utilize common ata_platform_remove_one()
pata_of_platform: utilize common ata_platform_remove_one()
pata_mpc52xx: utilize common ata_platform_remove_one()
pata_ixp4xx_cf: utilize common ata_platform_remove_one()
ahci_platform: utilize common ata_platform_remove_one()
libata: implement ata_platform_remove_one()
...
Diffstat (limited to 'drivers/ata/libahci.c')
| -rw-r--r-- | drivers/ata/libahci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c index 4201e535a8c..320712a7b9e 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -1384,7 +1384,7 @@ int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class, if (rc == -EIO) { irq_sts = readl(port_mmio + PORT_IRQ_STAT); if (irq_sts & PORT_IRQ_BAD_PMP) { - ata_link_printk(link, KERN_WARNING, + ata_link_warn(link, "applying PMP SRST workaround " "and retrying\n"); rc = ahci_do_softreset(link, class, 0, deadline, |