aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mtd/maps/physmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mtd/maps/physmap.c')
-rw-r--r--drivers/mtd/maps/physmap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 58207b3b9411..d3a2acc7e9be 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -106,13 +106,13 @@ static int physmap_flash_probe(struct platform_device *dev)
106 if (!devm_request_mem_region(&dev->dev, 106 if (!devm_request_mem_region(&dev->dev,
107 dev->resource[i].start, 107 dev->resource[i].start,
108 dev->resource[i].end - dev->resource[i].start + 1, 108 dev->resource[i].end - dev->resource[i].start + 1,
109 dev->dev.bus_id)) { 109 dev_name(&dev->dev))) {
110 dev_err(&dev->dev, "Could not reserve memory region\n"); 110 dev_err(&dev->dev, "Could not reserve memory region\n");
111 err = -ENOMEM; 111 err = -ENOMEM;
112 goto err_out; 112 goto err_out;
113 } 113 }
114 114
115 info->map[i].name = dev->dev.bus_id; 115 info->map[i].name = dev_name(&dev->dev);
116 info->map[i].phys = dev->resource[i].start; 116 info->map[i].phys = dev->resource[i].start;
117 info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1; 117 info->map[i].size = dev->resource[i].end - dev->resource[i].start + 1;
118 info->map[i].bankwidth = physmap_data->width; 118 info->map[i].bankwidth = physmap_data->width;
@@ -148,7 +148,7 @@ static int physmap_flash_probe(struct platform_device *dev)
148 * We detected multiple devices. Concatenate them together. 148 * We detected multiple devices. Concatenate them together.
149 */ 149 */
150#ifdef CONFIG_MTD_CONCAT 150#ifdef CONFIG_MTD_CONCAT
151 info->cmtd = mtd_concat_create(info->mtd, devices_found, dev->dev.bus_id); 151 info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
152 if (info->cmtd == NULL) 152 if (info->cmtd == NULL)
153 err = -ENXIO; 153 err = -ENXIO;
154#else 154#else