diff options
Diffstat (limited to 'drivers/video/pmagb-b-fb.c')
-rw-r--r-- | drivers/video/pmagb-b-fb.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/video/pmagb-b-fb.c b/drivers/video/pmagb-b-fb.c index 9b80597241b..98748723af9 100644 --- a/drivers/video/pmagb-b-fb.c +++ b/drivers/video/pmagb-b-fb.c | |||
@@ -258,7 +258,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
258 | 258 | ||
259 | info = framebuffer_alloc(sizeof(struct pmagbbfb_par), dev); | 259 | info = framebuffer_alloc(sizeof(struct pmagbbfb_par), dev); |
260 | if (!info) { | 260 | if (!info) { |
261 | printk(KERN_ERR "%s: Cannot allocate memory\n", dev->bus_id); | 261 | printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev)); |
262 | return -ENOMEM; | 262 | return -ENOMEM; |
263 | } | 263 | } |
264 | 264 | ||
@@ -267,7 +267,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
267 | 267 | ||
268 | if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) { | 268 | if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) { |
269 | printk(KERN_ERR "%s: Cannot allocate color map\n", | 269 | printk(KERN_ERR "%s: Cannot allocate color map\n", |
270 | dev->bus_id); | 270 | dev_name(dev)); |
271 | err = -ENOMEM; | 271 | err = -ENOMEM; |
272 | goto err_alloc; | 272 | goto err_alloc; |
273 | } | 273 | } |
@@ -280,8 +280,9 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
280 | /* Request the I/O MEM resource. */ | 280 | /* Request the I/O MEM resource. */ |
281 | start = tdev->resource.start; | 281 | start = tdev->resource.start; |
282 | len = tdev->resource.end - start + 1; | 282 | len = tdev->resource.end - start + 1; |
283 | if (!request_mem_region(start, len, dev->bus_id)) { | 283 | if (!request_mem_region(start, len, dev_name(dev))) { |
284 | printk(KERN_ERR "%s: Cannot reserve FB region\n", dev->bus_id); | 284 | printk(KERN_ERR "%s: Cannot reserve FB region\n", |
285 | dev_name(dev)); | ||
285 | err = -EBUSY; | 286 | err = -EBUSY; |
286 | goto err_cmap; | 287 | goto err_cmap; |
287 | } | 288 | } |
@@ -290,7 +291,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
290 | info->fix.mmio_start = start; | 291 | info->fix.mmio_start = start; |
291 | par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len); | 292 | par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len); |
292 | if (!par->mmio) { | 293 | if (!par->mmio) { |
293 | printk(KERN_ERR "%s: Cannot map MMIO\n", dev->bus_id); | 294 | printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev)); |
294 | err = -ENOMEM; | 295 | err = -ENOMEM; |
295 | goto err_resource; | 296 | goto err_resource; |
296 | } | 297 | } |
@@ -301,7 +302,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
301 | info->fix.smem_start = start + PMAGB_B_FBMEM; | 302 | info->fix.smem_start = start + PMAGB_B_FBMEM; |
302 | par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len); | 303 | par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len); |
303 | if (!par->smem) { | 304 | if (!par->smem) { |
304 | printk(KERN_ERR "%s: Cannot map FB\n", dev->bus_id); | 305 | printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev)); |
305 | err = -ENOMEM; | 306 | err = -ENOMEM; |
306 | goto err_mmio_map; | 307 | goto err_mmio_map; |
307 | } | 308 | } |
@@ -316,7 +317,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
316 | err = register_framebuffer(info); | 317 | err = register_framebuffer(info); |
317 | if (err < 0) { | 318 | if (err < 0) { |
318 | printk(KERN_ERR "%s: Cannot register framebuffer\n", | 319 | printk(KERN_ERR "%s: Cannot register framebuffer\n", |
319 | dev->bus_id); | 320 | dev_name(dev)); |
320 | goto err_smem_map; | 321 | goto err_smem_map; |
321 | } | 322 | } |
322 | 323 | ||
@@ -328,7 +329,7 @@ static int __init pmagbbfb_probe(struct device *dev) | |||
328 | par->osc1 / 1000, par->osc1 % 1000); | 329 | par->osc1 / 1000, par->osc1 % 1000); |
329 | 330 | ||
330 | pr_info("fb%d: %s frame buffer device at %s\n", | 331 | pr_info("fb%d: %s frame buffer device at %s\n", |
331 | info->node, info->fix.id, dev->bus_id); | 332 | info->node, info->fix.id, dev_name(dev)); |
332 | pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n", | 333 | pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n", |
333 | info->node, freq0, par->osc1 ? freq1 : "disabled", | 334 | info->node, freq0, par->osc1 ? freq1 : "disabled", |
334 | par->osc1 != 0); | 335 | par->osc1 != 0); |