5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/disk_ata_drive.c b/drivers/ata/disk_ata_drive.c
index 9b3730c8c4..1aa1bb1456 100644
--- a/drivers/ata/disk_ata_drive.c
+++ b/drivers/ata/disk_ata_drive.c
@@ -243,7 +243,7 @@ static int ata_port_init(struct ata_port *port)
 		rc = cdev_find_free_index("ata");
 		if (rc == -1)
 			pr_err("Cannot find a free index for the disk node\n");
-		port->blk.cdev.name = asprintf("ata%d", rc);
+		port->blk.cdev.name = basprintf("ata%d", rc);
 	}
 
 	port->blk.num_blocks = ata_id_n_sectors(port->id);
diff --git a/drivers/ata/disk_bios_drive.c b/drivers/ata/disk_bios_drive.c
index 8e768dc7f2..363af3c6dd 100644
--- a/drivers/ata/disk_bios_drive.c
+++ b/drivers/ata/disk_bios_drive.c
@@ -258,7 +258,7 @@ static int biosdisk_probe(struct device_d *dev)
 		rc = cdev_find_free_index("disk");
 		if (rc < 0)
 			pr_err("Cannot find a free number for the disk node\n");
-		m->blk.cdev.name = asprintf("disk%d", rc);
+		m->blk.cdev.name = basprintf("disk%d", rc);
 		m->blk.blockbits = SECTOR_SHIFT;
 
 		rc = blockdevice_register(&m->blk);
diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c
index 6e74bfb089..c3af0833ba 100644
--- a/drivers/ata/intf_platform_ide.c
+++ b/drivers/ata/intf_platform_ide.c
@@ -27,7 +27,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <ata_drive.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
 #include <linux/err.h>
 #include <of.h>
 
diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c
index 842957331e..c8098a537f 100644
--- a/drivers/ata/pata-imx.c
+++ b/drivers/ata/pata-imx.c
@@ -28,7 +28,7 @@
 #include <malloc.h>
 #include <errno.h>
 #include <ata_drive.h>
-#include <platform_ide.h>
+#include <platform_data/ide.h>
 #include <io.h>
 #include <of.h>
 #include <linux/err.h>
diff --git a/drivers/ata/sata-imx.c b/drivers/ata/sata-imx.c
index 6a601956db..7b8036bbf3 100644
--- a/drivers/ata/sata-imx.c
+++ b/drivers/ata/sata-imx.c
@@ -112,7 +112,7 @@ static int imx_sata_probe(struct device_d *dev)
 
 	imx_ahci->ahci.dev = dev;
 	dev->priv = &imx_ahci->ahci;
-	dev->info = ahci_info,
+	dev->info = ahci_info;
 
 	ret = ahci_add_host(&imx_ahci->ahci);
 	if (ret)