Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ad33e74 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

video: struct device - replace bus_id with dev_name(), dev_set_name() 



Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 6c7377ab

drivers/video/pmag-ba-fb.c

+9 −8
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int __init pmagbafb_probe(struct device *dev) 


	info = framebuffer_alloc(sizeof(struct pmagbafb_par), dev);

	if (!info) {

		printk(KERN_ERR "%s: Cannot allocate memory\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));

		return -ENOMEM;

	}
@@ -160,7 +160,7 @@ static int __init pmagbafb_probe(struct device *dev) 


	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {

		printk(KERN_ERR "%s: Cannot allocate color map\n",

		       dev->bus_id);

		       dev_name(dev));

		err = -ENOMEM;

		goto err_alloc;

	}
@@ -173,8 +173,9 @@ static int __init pmagbafb_probe(struct device *dev) 
	/* Request the I/O MEM resource.  */

	start = tdev->resource.start;

	len = tdev->resource.end - start + 1;

	if (!request_mem_region(start, len, dev->bus_id)) {

		printk(KERN_ERR "%s: Cannot reserve FB region\n", dev->bus_id);

	if (!request_mem_region(start, len, dev_name(dev))) {

		printk(KERN_ERR "%s: Cannot reserve FB region\n",

		       dev_name(dev));

		err = -EBUSY;

		goto err_cmap;

	}
@@ -183,7 +184,7 @@ static int __init pmagbafb_probe(struct device *dev) 
	info->fix.mmio_start = start;

	par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);

	if (!par->mmio) {

		printk(KERN_ERR "%s: Cannot map MMIO\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));

		err = -ENOMEM;

		goto err_resource;

	}
@@ -194,7 +195,7 @@ static int __init pmagbafb_probe(struct device *dev) 
	info->screen_base = ioremap_nocache(info->fix.smem_start,

					    info->fix.smem_len);

	if (!info->screen_base) {

		printk(KERN_ERR "%s: Cannot map FB\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));

		err = -ENOMEM;

		goto err_mmio_map;

	}
@@ -205,14 +206,14 @@ static int __init pmagbafb_probe(struct device *dev) 
	err = register_framebuffer(info);

	if (err < 0) {

		printk(KERN_ERR "%s: Cannot register framebuffer\n",

		       dev->bus_id);

		       dev_name(dev));

		goto err_smem_map;

	}



	get_device(dev);



	pr_info("fb%d: %s frame buffer device at %s\n",

		info->node, info->fix.id, dev->bus_id);

		info->node, info->fix.id, dev_name(dev));



	return 0;

drivers/video/pmagb-b-fb.c

+9 −8
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static int __init pmagbbfb_probe(struct device *dev) 


	info = framebuffer_alloc(sizeof(struct pmagbbfb_par), dev);

	if (!info) {

		printk(KERN_ERR "%s: Cannot allocate memory\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot allocate memory\n", dev_name(dev));

		return -ENOMEM;

	}
@@ -267,7 +267,7 @@ static int __init pmagbbfb_probe(struct device *dev) 


	if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {

		printk(KERN_ERR "%s: Cannot allocate color map\n",

		       dev->bus_id);

		       dev_name(dev));

		err = -ENOMEM;

		goto err_alloc;

	}
@@ -280,8 +280,9 @@ static int __init pmagbbfb_probe(struct device *dev) 
	/* Request the I/O MEM resource.  */

	start = tdev->resource.start;

	len = tdev->resource.end - start + 1;

	if (!request_mem_region(start, len, dev->bus_id)) {

		printk(KERN_ERR "%s: Cannot reserve FB region\n", dev->bus_id);

	if (!request_mem_region(start, len, dev_name(dev))) {

		printk(KERN_ERR "%s: Cannot reserve FB region\n",

		       dev_name(dev));

		err = -EBUSY;

		goto err_cmap;

	}
@@ -290,7 +291,7 @@ static int __init pmagbbfb_probe(struct device *dev) 
	info->fix.mmio_start = start;

	par->mmio = ioremap_nocache(info->fix.mmio_start, info->fix.mmio_len);

	if (!par->mmio) {

		printk(KERN_ERR "%s: Cannot map MMIO\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot map MMIO\n", dev_name(dev));

		err = -ENOMEM;

		goto err_resource;

	}
@@ -301,7 +302,7 @@ static int __init pmagbbfb_probe(struct device *dev) 
	info->fix.smem_start = start + PMAGB_B_FBMEM;

	par->smem = ioremap_nocache(info->fix.smem_start, info->fix.smem_len);

	if (!par->smem) {

		printk(KERN_ERR "%s: Cannot map FB\n", dev->bus_id);

		printk(KERN_ERR "%s: Cannot map FB\n", dev_name(dev));

		err = -ENOMEM;

		goto err_mmio_map;

	}
@@ -316,7 +317,7 @@ static int __init pmagbbfb_probe(struct device *dev) 
	err = register_framebuffer(info);

	if (err < 0) {

		printk(KERN_ERR "%s: Cannot register framebuffer\n",

		       dev->bus_id);

		       dev_name(dev));

		goto err_smem_map;

	}
@@ -328,7 +329,7 @@ static int __init pmagbbfb_probe(struct device *dev) 
		 par->osc1 / 1000, par->osc1 % 1000);



	pr_info("fb%d: %s frame buffer device at %s\n",

		info->node, info->fix.id, dev->bus_id);

		info->node, info->fix.id, dev_name(dev));

	pr_info("fb%d: Osc0: %s, Osc1: %s, Osc%u selected\n",

		info->node, freq0, par->osc1 ? freq1 : "disabled",

		par->osc1 != 0);

drivers/video/ps3fb.c

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ static int __devinit ps3fb_probe(struct ps3_system_bus_device *dev) 
	dev->core.driver_data = info;



	dev_info(info->device, "%s %s, using %u KiB of video memory\n",

		 dev_driver_string(info->dev), info->dev->bus_id,

		 dev_driver_string(info->dev), dev_name(info->dev),

		 info->fix.smem_len >> 10);



	task = kthread_run(ps3fbd, info, DEVICE_NAME);

drivers/video/sh_mobile_lcdcfb.c

+1 −1
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev) 
	}



	error = request_irq(i, sh_mobile_lcdc_irq, IRQF_DISABLED,

			    pdev->dev.bus_id, priv);

			    dev_name(&pdev->dev), priv);

	if (error) {

		dev_err(&pdev->dev, "unable to request irq\n");

		goto err1;

drivers/video/tmiofb.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static int __devinit tmiofb_probe(struct platform_device *dev) 
	}



	retval = request_irq(irq, &tmiofb_irq, IRQF_DISABLED,

					dev->dev.bus_id, info);

					dev_name(&dev->dev), info);



	if (retval)

		goto err_request_irq;