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

Commit 20e061fb authored by Ondrej Zajicek's avatar Ondrej Zajicek Committed by Linus Torvalds
Browse files

fbdev: framebuffer_alloc() fixes 



Correct the dev arg of framebuffer_alloc() in arkfb, s3fb and vt8623fb.

Signed-off-by: default avatarOndrej Zajicek <santiago@crfreenet.org>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8f5af9de

drivers/video/arkfb.c

+10 −10
Original line number Diff line number Diff line
@@ -943,7 +943,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
	}



	/* Allocate and fill driver data structure */

	info = framebuffer_alloc(sizeof(struct arkfb_info), NULL);

	info = framebuffer_alloc(sizeof(struct arkfb_info), &(dev->dev));

	if (! info) {

		dev_err(&(dev->dev), "cannot allocate memory\n");

		return -ENOMEM;
@@ -958,20 +958,20 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
	/* Prepare PCI device */

	rc = pci_enable_device(dev);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot enable PCI device\n");

		dev_err(info->dev, "cannot enable PCI device\n");

		goto err_enable_device;

	}



	rc = pci_request_regions(dev, "arkfb");

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot reserve framebuffer region\n");

		dev_err(info->dev, "cannot reserve framebuffer region\n");

		goto err_request_regions;

	}



	par->dac = ics5342_init(ark_dac_read_regs, ark_dac_write_regs, info);

	if (! par->dac) {

		rc = -ENOMEM;

		dev_err(&(dev->dev), "RAMDAC initialization failed\n");

		dev_err(info->dev, "RAMDAC initialization failed\n");

		goto err_dac;

	}
@@ -982,7 +982,7 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
	info->screen_base = pci_iomap(dev, 0, 0);

	if (! info->screen_base) {

		rc = -ENOMEM;

		dev_err(&(dev->dev), "iomap for framebuffer failed\n");

		dev_err(info->dev, "iomap for framebuffer failed\n");

		goto err_iomap;

	}
@@ -1004,19 +1004,19 @@ static int __devinit ark_pci_probe(struct pci_dev *dev, const struct pci_device_ 
	rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);

	if (! ((rc == 1) || (rc == 2))) {

		rc = -EINVAL;

		dev_err(&(dev->dev), "mode %s not found\n", mode_option);

		dev_err(info->dev, "mode %s not found\n", mode_option);

		goto err_find_mode;

	}



	rc = fb_alloc_cmap(&info->cmap, 256, 0);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot allocate colormap\n");

		dev_err(info->dev, "cannot allocate colormap\n");

		goto err_alloc_cmap;

	}



	rc = register_framebuffer(info);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot register framebugger\n");

		dev_err(info->dev, "cannot register framebugger\n");

		goto err_reg_fb;

	}
@@ -1090,7 +1090,7 @@ static int ark_pci_suspend (struct pci_dev* dev, pm_message_t state) 
	struct fb_info *info = pci_get_drvdata(dev);

	struct arkfb_info *par = info->par;



	dev_info(&(dev->dev), "suspend\n");

	dev_info(info->dev, "suspend\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));
@@ -1121,7 +1121,7 @@ static int ark_pci_resume (struct pci_dev* dev) 
	struct fb_info *info = pci_get_drvdata(dev);

	struct arkfb_info *par = info->par;



	dev_info(&(dev->dev), "resume\n");

	dev_info(info->dev, "resume\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));

drivers/video/s3fb.c

+10 −10
Original line number Diff line number Diff line
@@ -888,7 +888,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i 
	}



	/* Allocate and fill driver data structure */

	info = framebuffer_alloc(sizeof(struct s3fb_info), NULL);

	info = framebuffer_alloc(sizeof(struct s3fb_info), &(dev->dev));

	if (!info) {

		dev_err(&(dev->dev), "cannot allocate memory\n");

		return -ENOMEM;
@@ -903,13 +903,13 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i 
	/* Prepare PCI device */

	rc = pci_enable_device(dev);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot enable PCI device\n");

		dev_err(info->dev, "cannot enable PCI device\n");

		goto err_enable_device;

	}



	rc = pci_request_regions(dev, "s3fb");

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot reserve framebuffer region\n");

		dev_err(info->dev, "cannot reserve framebuffer region\n");

		goto err_request_regions;

	}
@@ -921,7 +921,7 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i 
	info->screen_base = pci_iomap(dev, 0, 0);

	if (! info->screen_base) {

		rc = -ENOMEM;

		dev_err(&(dev->dev), "iomap for framebuffer failed\n");

		dev_err(info->dev, "iomap for framebuffer failed\n");

		goto err_iomap;

	}
@@ -965,19 +965,19 @@ static int __devinit s3_pci_probe(struct pci_dev *dev, const struct pci_device_i 
	rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);

	if (! ((rc == 1) || (rc == 2))) {

		rc = -EINVAL;

		dev_err(&(dev->dev), "mode %s not found\n", mode_option);

		dev_err(info->dev, "mode %s not found\n", mode_option);

		goto err_find_mode;

	}



	rc = fb_alloc_cmap(&info->cmap, 256, 0);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot allocate colormap\n");

		dev_err(info->dev, "cannot allocate colormap\n");

		goto err_alloc_cmap;

	}



	rc = register_framebuffer(info);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot register framebuffer\n");

		dev_err(info->dev, "cannot register framebuffer\n");

		goto err_reg_fb;

	}
@@ -1053,7 +1053,7 @@ static int s3_pci_suspend(struct pci_dev* dev, pm_message_t state) 
	struct fb_info *info = pci_get_drvdata(dev);

	struct s3fb_info *par = info->par;



	dev_info(&(dev->dev), "suspend\n");

	dev_info(info->dev, "suspend\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));
@@ -1085,7 +1085,7 @@ static int s3_pci_resume(struct pci_dev* dev) 
	struct s3fb_info *par = info->par;

	int err;



	dev_info(&(dev->dev), "resume\n");

	dev_info(info->dev, "resume\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));
@@ -1102,7 +1102,7 @@ static int s3_pci_resume(struct pci_dev* dev) 
	if (err) {

		mutex_unlock(&(par->open_lock));

		release_console_sem();

		dev_err(&(dev->dev), "error %d enabling device for resume\n", err);

		dev_err(info->dev, "error %d enabling device for resume\n", err);

		return err;

	}

	pci_set_master(dev);

drivers/video/vt8623fb.c

+11 −11
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi 
	}



	/* Allocate and fill driver data structure */

	info = framebuffer_alloc(sizeof(struct vt8623fb_info), NULL);

	info = framebuffer_alloc(sizeof(struct vt8623fb_info), &(dev->dev));

	if (! info) {

		dev_err(&(dev->dev), "cannot allocate memory\n");

		return -ENOMEM;
@@ -677,13 +677,13 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi 


	rc = pci_enable_device(dev);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot enable PCI device\n");

		dev_err(info->dev, "cannot enable PCI device\n");

		goto err_enable_device;

	}



	rc = pci_request_regions(dev, "vt8623fb");

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot reserve framebuffer region\n");

		dev_err(info->dev, "cannot reserve framebuffer region\n");

		goto err_request_regions;

	}
@@ -696,14 +696,14 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi 
	info->screen_base = pci_iomap(dev, 0, 0);

	if (! info->screen_base) {

		rc = -ENOMEM;

		dev_err(&(dev->dev), "iomap for framebuffer failed\n");

		dev_err(info->dev, "iomap for framebuffer failed\n");

		goto err_iomap_1;

	}



	par->mmio_base = pci_iomap(dev, 1, 0);

	if (! par->mmio_base) {

		rc = -ENOMEM;

		dev_err(&(dev->dev), "iomap for MMIO failed\n");

		dev_err(info->dev, "iomap for MMIO failed\n");

		goto err_iomap_2;

	}
@@ -714,7 +714,7 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi 
	if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))

		info->screen_size = memsize1 << 20;

	else {

		dev_err(&(dev->dev), "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);

		dev_err(info->dev, "memory size detection failed (%x %x), suppose 16 MB\n", memsize1, memsize2);

		info->screen_size = 16 << 20;

	}
@@ -731,19 +731,19 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi 
	rc = fb_find_mode(&(info->var), info, mode_option, NULL, 0, NULL, 8);

	if (! ((rc == 1) || (rc == 2))) {

		rc = -EINVAL;

		dev_err(&(dev->dev), "mode %s not found\n", mode_option);

		dev_err(info->dev, "mode %s not found\n", mode_option);

		goto err_find_mode;

	}



	rc = fb_alloc_cmap(&info->cmap, 256, 0);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot allocate colormap\n");

		dev_err(info->dev, "cannot allocate colormap\n");

		goto err_alloc_cmap;

	}



	rc = register_framebuffer(info);

	if (rc < 0) {

		dev_err(&(dev->dev), "cannot register framebugger\n");

		dev_err(info->dev, "cannot register framebugger\n");

		goto err_reg_fb;

	}
@@ -817,7 +817,7 @@ static int vt8623_pci_suspend(struct pci_dev* dev, pm_message_t state) 
	struct fb_info *info = pci_get_drvdata(dev);

	struct vt8623fb_info *par = info->par;



	dev_info(&(dev->dev), "suspend\n");

	dev_info(info->dev, "suspend\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));
@@ -848,7 +848,7 @@ static int vt8623_pci_resume(struct pci_dev* dev) 
	struct fb_info *info = pci_get_drvdata(dev);

	struct vt8623fb_info *par = info->par;



	dev_info(&(dev->dev), "resume\n");

	dev_info(info->dev, "resume\n");



	acquire_console_sem();

	mutex_lock(&(par->open_lock));