Merge branch 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[pandora-kernel.git] / drivers / ata / sata_sis.c

diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c
index cdcc13e..447d9c0 100644 (file)
--- a/drivers/ata/sata_sis.c
+++ b/drivers/ata/sata_sis.c
@@ -193,7 +193,6 @@ static int sis_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)
 
 static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       static int printed_version;
        struct ata_port_info pi = sis_port_info;
        const struct ata_port_info *ppi[] = { &pi, &pi };
        struct ata_host *host;
@@ -202,8 +201,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        u8 port2_start = 0x20;
        int i, rc;
 
-       if (!printed_version++)
-               dev_printk(KERN_INFO, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        rc = pcim_enable_device(pdev);
        if (rc)
@@ -241,12 +239,12 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                        break;
                }
                if ((pmr & SIS_PMR_COMBINED) == 0) {
-                       dev_printk(KERN_INFO, &pdev->dev,
-                                  "Detected SiS 180/181/964 chipset in SATA mode\n");
+                       dev_info(&pdev->dev,
+                                "Detected SiS 180/181/964 chipset in SATA mode\n");
                        port2_start = 64;
                } else {
-                       dev_printk(KERN_INFO, &pdev->dev,
-                                  "Detected SiS 180/181 chipset in combined mode\n");
+                       dev_info(&pdev->dev,
+                                "Detected SiS 180/181 chipset in combined mode\n");
                        port2_start = 0;
                        pi.flags |= ATA_FLAG_SLAVE_POSS;
                }
@@ -256,24 +254,22 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        case 0x0183:
                pci_read_config_dword(pdev, 0x6C, &val);
                if (val & (1L << 31)) {
-                       dev_printk(KERN_INFO, &pdev->dev,
-                                  "Detected SiS 182/965 chipset\n");
+                       dev_info(&pdev->dev, "Detected SiS 182/965 chipset\n");
                        pi.flags |= ATA_FLAG_SLAVE_POSS;
                } else {
-                       dev_printk(KERN_INFO, &pdev->dev,
-                                  "Detected SiS 182/965L chipset\n");
+                       dev_info(&pdev->dev, "Detected SiS 182/965L chipset\n");
                }
                break;
 
        case 0x1182:
-               dev_printk(KERN_INFO, &pdev->dev,
-                          "Detected SiS 1182/966/680 SATA controller\n");
+               dev_info(&pdev->dev,
+                        "Detected SiS 1182/966/680 SATA controller\n");
                pi.flags |= ATA_FLAG_SLAVE_POSS;
                break;
 
        case 0x1183:
-               dev_printk(KERN_INFO, &pdev->dev,
-                          "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n");
+               dev_info(&pdev->dev,
+                        "Detected SiS 1183/966/966L/968/680 controller in PATA mode\n");
                ppi[0] = &sis_info133_for_sata;
                ppi[1] = &sis_info133_for_sata;
                break;