Merge tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / ata / pata_marvell.c

diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c
index 361597d..0c5a519 100644 (file)
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
@@ -32,7 +32,6 @@
 
 static int marvell_pata_active(struct pci_dev *pdev)
 {
-       int i;
        u32 devices;
        void __iomem *barp;
 
@@ -44,11 +43,6 @@ static int marvell_pata_active(struct pci_dev *pdev)
        if (barp == NULL)
                return -ENOMEM;
 
-       printk("BAR5:");
-       for(i = 0; i <= 0x0F; i++)
-               printk("%02X:%02X ", i, ioread8(barp + i));
-       printk("\n");
-
        devices = ioread32(barp + 0x0C);
        pci_iounmap(pdev, barp);
 
@@ -149,7 +143,8 @@ static int marvell_init_one (struct pci_dev *pdev, const struct pci_device_id *i
 
 #if IS_ENABLED(CONFIG_SATA_AHCI)
        if (!marvell_pata_active(pdev)) {
-               printk(KERN_INFO DRV_NAME ": PATA port not active, deferring to AHCI driver.\n");
+               dev_info(&pdev->dev,
+                        "PATA port not active, deferring to AHCI driver.\n");
                return -ENODEV;
        }
 #endif