Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / ata / acard-ahci.c

diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
index ae22be4157b5b63927fbda9c8eb7858011194ae8..4e94ba29cb8d321eae212fa27ee1e72658801c34 100644 (file)
--- a/drivers/ata/acard-ahci.c
+++ b/drivers/ata/acard-ahci.c
@@ -135,8 +135,8 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg
 
        if (mesg.event & PM_EVENT_SUSPEND &&
            hpriv->flags & AHCI_HFLAG_NO_SUSPEND) {
-               dev_printk(KERN_ERR, &pdev->dev,
-                          "BIOS update required for suspend/resume\n");
+               dev_err(&pdev->dev,
+                       "BIOS update required for suspend/resume\n");
                return -EIO;
        }
 
@@ -187,7 +187,7 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
                if (rc) {
                        rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                        if (rc) {
-                               dev_printk(KERN_ERR, &pdev->dev,
+                               dev_err(&pdev->dev,
                                           "64-bit DMA enable failed\n");
                                return rc;
                        }
@@ -195,14 +195,13 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
        } else {
                rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
                if (rc) {
-                       dev_printk(KERN_ERR, &pdev->dev,
-                                  "32-bit DMA enable failed\n");
+                       dev_err(&pdev->dev, "32-bit DMA enable failed\n");
                        return rc;
                }
                rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
                if (rc) {
-                       dev_printk(KERN_ERR, &pdev->dev,
-                                  "32-bit consistent DMA enable failed\n");
+                       dev_err(&pdev->dev,
+                               "32-bit consistent DMA enable failed\n");
                        return rc;
                }
        }
@@ -343,14 +342,12 @@ static int acard_ahci_port_start(struct ata_port *ap)
                if (cmd & PORT_CMD_FBSCP)
                        pp->fbs_supported = true;
                else if (hpriv->flags & AHCI_HFLAG_YES_FBS) {
-                       dev_printk(KERN_INFO, dev,
-                                  "port %d can do FBS, forcing FBSCP\n",
-                                  ap->port_no);
+                       dev_info(dev, "port %d can do FBS, forcing FBSCP\n",
+                                ap->port_no);
                        pp->fbs_supported = true;
                } else
-                       dev_printk(KERN_WARNING, dev,
-                                  "port %d is not capable of FBS\n",
-                                  ap->port_no);
+                       dev_warn(dev, "port %d is not capable of FBS\n",
+                                ap->port_no);
        }
 
        if (pp->fbs_supported) {
@@ -406,7 +403,6 @@ static int acard_ahci_port_start(struct ata_port *ap)
 
 static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
-       static int printed_version;
        unsigned int board_id = ent->driver_data;
        struct ata_port_info pi = acard_ahci_port_info[board_id];
        const struct ata_port_info *ppi[] = { &pi, NULL };
@@ -419,8 +415,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id
 
        WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* acquire resources */
        rc = pcim_enable_device(pdev);
@@ -508,21 +503,10 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id
                                 &acard_ahci_sht);
 }
 
-static int __init acard_ahci_init(void)
-{
-       return pci_register_driver(&acard_ahci_pci_driver);
-}
-
-static void __exit acard_ahci_exit(void)
-{
-       pci_unregister_driver(&acard_ahci_pci_driver);
-}
+module_pci_driver(acard_ahci_pci_driver);
 
 MODULE_AUTHOR("Jeff Garzik");
 MODULE_DESCRIPTION("ACard AHCI SATA low-level driver");
 MODULE_LICENSE("GPL");
 MODULE_DEVICE_TABLE(pci, acard_ahci_pci_tbl);
 MODULE_VERSION(DRV_VERSION);
-
-module_init(acard_ahci_init);
-module_exit(acard_ahci_exit);