diff --git a/[refs] b/[refs]
index e3bec0694483..f4a83d26be65 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 22c8be31446fabae7e5448ebddc65db59187608e
+refs/heads/master: 39f80acb9fe5adff216bde33c554e4bf5f6eec12
diff --git a/trunk/drivers/ata/libahci.c b/trunk/drivers/ata/libahci.c
index 4201e535a8c8..320712a7b9ea 100644
--- a/trunk/drivers/ata/libahci.c
+++ b/trunk/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,