Merge tag 'pinctrl-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[~andy/linux] / drivers / ata / pata_cmd64x.c

diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c
index 7ba01415b676d89dc2e18e68c5f949bd81dd3453..2949cfc2dd31ab9c234c55cf706c09f8e6848573 100644 (file)
--- a/drivers/ata/pata_cmd64x.c
+++ b/drivers/ata/pata_cmd64x.c
@@ -474,14 +474,14 @@ static int cmd64x_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        /* check for enabled ports */
        pci_read_config_byte(pdev, CNTRL, &reg);
        if (!port_ok)
-               dev_printk(KERN_NOTICE, &pdev->dev, "Mobility Bridge detected, ignoring CNTRL port enable/disable\n");
+               dev_notice(&pdev->dev, "Mobility Bridge detected, ignoring CNTRL port enable/disable\n");
        if (port_ok && cntrl_ch0_ok && !(reg & CNTRL_CH0)) {
-               dev_printk(KERN_NOTICE, &pdev->dev, "Primary port is disabled\n");
+               dev_notice(&pdev->dev, "Primary port is disabled\n");
                ppi[0] = &ata_dummy_port_info;
 
        }
        if (port_ok && !(reg & CNTRL_CH1)) {
-               dev_printk(KERN_NOTICE, &pdev->dev, "Secondary port is disabled\n");
+               dev_notice(&pdev->dev, "Secondary port is disabled\n");
                ppi[1] = &ata_dummy_port_info;
        }