Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

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

diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index f03ad48..000fcc9 100644 (file)
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -134,9 +134,7 @@ enum {
        PDC_IRQ_DISABLE         = (1 << 10),
        PDC_RESET               = (1 << 11), /* HDMA reset */
 
-       PDC_COMMON_FLAGS        = ATA_FLAG_NO_LEGACY |
-                                 ATA_FLAG_MMIO |
-                                 ATA_FLAG_PIO_POLLING,
+       PDC_COMMON_FLAGS        = ATA_FLAG_PIO_POLLING,
 
        /* ap->flags bits */
        PDC_FLAG_GEN_II         = (1 << 24),
@@ -1181,7 +1179,6 @@ static void pdc_host_init(struct ata_host *host)
 static int pdc_ata_init_one(struct pci_dev *pdev,
                            const struct pci_device_id *ent)
 {
-       static int printed_version;
        const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];
        const struct ata_port_info *ppi[PDC_MAX_PORTS];
        struct ata_host *host;
@@ -1189,8 +1186,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
        int n_ports, i, rc;
        int is_sataii_tx4;
 
-       if (!printed_version++)
-               dev_printk(KERN_DEBUG, &pdev->dev, "version " DRV_VERSION "\n");
+       ata_print_version_once(&pdev->dev, DRV_VERSION);
 
        /* enable and acquire resources */
        rc = pcim_enable_device(pdev);
@@ -1219,7 +1215,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,
 
        host = ata_host_alloc_pinfo(&pdev->dev, ppi, n_ports);
        if (!host) {
-               dev_printk(KERN_ERR, &pdev->dev, "failed to allocate host\n");
+               dev_err(&pdev->dev, "failed to allocate host\n");
                return -ENOMEM;
        }
        host->iomap = pcim_iomap_table(pdev);