]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
[libata ata_piix] use dev_printk() where appropriate
authorJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 11:42:18 +0000 (06:42 -0500)
committerJeff Garzik <jgarzik@pobox.com>
Sun, 30 Oct 2005 11:42:18 +0000 (06:42 -0500)
drivers/scsi/ata_piix.c

index be021478f41628ddc53f95adf0150534ce937454..b7fbf11f3faeff84c63b90e36451e4a2b2103889 100644 (file)
@@ -45,6 +45,7 @@
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/blkdev.h>
 #include <linux/delay.h>
+#include <linux/device.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
 #include "scsi.h"
 #include <scsi/scsi_host.h>
 #include <linux/libata.h>
@@ -625,7 +626,8 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
        unsigned int pata_chan = 0, sata_chan = 0;
 
        if (!printed_version++)
        unsigned int pata_chan = 0, sata_chan = 0;
 
        if (!printed_version++)
-               printk(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
+               dev_printk(KERN_DEBUG, &pdev->dev,
+                          "version " DRV_VERSION "\n");
 
        /* no hotplugging support (FIXME) */
        if (!in_module_init)
 
        /* no hotplugging support (FIXME) */
        if (!in_module_init)
@@ -672,7 +674,9 @@ static int piix_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                port_info[pata_chan] = &piix_port_info[ich5_pata];
                n_ports++;
 
                port_info[pata_chan] = &piix_port_info[ich5_pata];
                n_ports++;
 
-               printk(KERN_WARNING DRV_NAME ": combined mode detected\n");
+               dev_printk(KERN_WARNING, &pdev->dev,
+                          "combined mode detected (p=%u, s=%u)\n",
+                          pata_chan, sata_chan);
        }
 
        return ata_pci_init_one(pdev, port_info, n_ports);
        }
 
        return ata_pci_init_one(pdev, port_info, n_ports);