Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 2d15f25..62c5d00 100644 (file)
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -473,12 +473,12 @@ static int it821x_smart_set_mode(struct ata_link *link, struct ata_device **unus
                /* We do need the right mode information for DMA or PIO
                   and this comes from the current configuration flags */
                if (ata_id_has_dma(dev->id)) {
-                       ata_dev_printk(dev, KERN_INFO, "configured for DMA\n");
+                       ata_dev_info(dev, "configured for DMA\n");
                        dev->xfer_mode = XFER_MW_DMA_0;
                        dev->xfer_shift = ATA_SHIFT_MWDMA;
                        dev->flags &= ~ATA_DFLAG_PIO;
                } else {
-                       ata_dev_printk(dev, KERN_INFO, "configured for PIO\n");
+                       ata_dev_info(dev, "configured for PIO\n");
                        dev->xfer_mode = XFER_PIO_0;
                        dev->xfer_shift = ATA_SHIFT_PIO;
                        dev->flags |= ATA_DFLAG_PIO;
@@ -508,12 +508,12 @@ static void it821x_dev_config(struct ata_device *adev)
 
        if (strstr(model_num, "Integrated Technology Express")) {
                /* RAID mode */
-               ata_dev_printk(adev, KERN_INFO, "%sRAID%d volume",
-                       adev->id[147]?"Bootable ":"",
-                       adev->id[129]);
+               ata_dev_info(adev, "%sRAID%d volume",
+                            adev->id[147] ? "Bootable " : "",
+                            adev->id[129]);
                if (adev->id[129] != 1)
-                       printk("(%dK stripe)", adev->id[146]);
-               printk(".\n");
+                       pr_cont("(%dK stripe)", adev->id[146]);
+               pr_cont("\n");
        }
        /* This is a controller firmware triggered funny, don't
           report the drive faulty! */
@@ -610,7 +610,7 @@ static void it821x_display_disk(int n, u8 *buf)
        char *cbl = "(40 wire cable)";
 
        static const char *types[5] = {
-               "RAID0", "RAID1" "RAID 0+1", "JBOD", "DISK"
+               "RAID0", "RAID1", "RAID 0+1", "JBOD", "DISK"
        };
 
        if (buf[52] > 4)        /* No Disk */