Commit 0a7f17aa authored by Laurent Pinchart's avatar Laurent Pinchart
Browse files

fbdev: sh_mobile_lcdc: Don't pass struct device around 



Pass a pointer to a struct sh_mobile_lcdc_priv instead, which stores a
pointer to the device.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
parent 4774c12a

drivers/video/sh_mobile_lcdcfb.c

+21 −20
Original line number Diff line number Diff line
@@ -187,9 +187,8 @@ static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) 
	}

}



static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev,

				       int clock_source,

				       struct sh_mobile_lcdc_priv *priv)

static int sh_mobile_lcdc_setup_clocks(struct sh_mobile_lcdc_priv *priv,

				       int clock_source)

{

	struct clk *clk;

	char *str;
@@ -214,9 +213,9 @@ static int sh_mobile_lcdc_setup_clocks(struct platform_device *pdev, 
	if (str == NULL)

		return 0;



	clk = clk_get(&pdev->dev, str);

	clk = clk_get(priv->dev, str);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "cannot get dot clock %s\n", str);

		dev_err(priv->dev, "cannot get dot clock %s\n", str);

		return PTR_ERR(clk);

	}
@@ -1563,8 +1562,9 @@ static int __devinit sh_mobile_lcdc_check_interface(struct sh_mobile_lcdc_chan * 
	return 0;

}



static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch,

						 struct device *dev)

static int __devinit

sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_priv *priv,

			    struct sh_mobile_lcdc_chan *ch)

{

	struct sh_mobile_lcdc_chan_cfg *cfg = &ch->cfg;

	const struct fb_videomode *max_mode;
@@ -1580,9 +1580,9 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch, 
	mutex_init(&ch->open_lock);



	/* Allocate the frame buffer device. */

	ch->info = framebuffer_alloc(0, dev);

	ch->info = framebuffer_alloc(0, priv->dev);

	if (!ch->info) {

		dev_err(dev, "unable to allocate fb_info\n");

		dev_err(priv->dev, "unable to allocate fb_info\n");

		return -ENOMEM;

	}
@@ -1604,8 +1604,8 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch, 
		/* NV12/NV21 buffers must have even number of lines */

		if ((cfg->fourcc == V4L2_PIX_FMT_NV12 ||

		     cfg->fourcc == V4L2_PIX_FMT_NV21) && (mode->yres & 0x1)) {

			dev_err(dev, "yres must be multiple of 2 for YCbCr420 "

				"mode.\n");

			dev_err(priv->dev, "yres must be multiple of 2 for "

				"YCbCr420 mode.\n");

			return -EINVAL;

		}
@@ -1618,7 +1618,7 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch, 
	if (!max_size)

		max_size = MAX_XRES * MAX_YRES;

	else

		dev_dbg(dev, "Found largest videomode %ux%u\n",

		dev_dbg(priv->dev, "Found largest videomode %ux%u\n",

			max_mode->xres, max_mode->yres);



	/* Create the mode list. */
@@ -1669,16 +1669,17 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch, 
	max_size = max_size * var->bits_per_pixel / 8 * 2;



	/* Allocate frame buffer memory and color map. */

	buf = dma_alloc_coherent(dev, max_size, &ch->dma_handle, GFP_KERNEL);

	buf = dma_alloc_coherent(priv->dev, max_size, &ch->dma_handle,

				 GFP_KERNEL);

	if (!buf) {

		dev_err(dev, "unable to allocate buffer\n");

		dev_err(priv->dev, "unable to allocate buffer\n");

		return -ENOMEM;

	}



	ret = fb_alloc_cmap(&info->cmap, PALETTE_NR, 0);

	if (ret < 0) {

		dev_err(dev, "unable to allocate cmap\n");

		dma_free_coherent(dev, max_size, buf, ch->dma_handle);

		dev_err(priv->dev, "unable to allocate cmap\n");

		dma_free_coherent(priv->dev, max_size, buf, ch->dma_handle);

		return ret;

	}
@@ -1701,7 +1702,7 @@ static int __devinit sh_mobile_lcdc_channel_init(struct sh_mobile_lcdc_chan *ch, 
	}



	info->screen_base = buf;

	info->device = dev;

	info->device = priv->dev;

	ch->display_var = *var;



	return 0;
@@ -1795,7 +1796,7 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 
	if (!priv->base)

		goto err1;



	error = sh_mobile_lcdc_setup_clocks(pdev, pdata->clock_source, priv);

	error = sh_mobile_lcdc_setup_clocks(priv, pdata->clock_source);

	if (error) {

		dev_err(&pdev->dev, "unable to setup clocks\n");

		goto err1;
@@ -1807,7 +1808,7 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 
	for (i = 0; i < num_channels; i++) {

		struct sh_mobile_lcdc_chan *ch = priv->ch + i;



		error = sh_mobile_lcdc_channel_init(ch, &pdev->dev);

		error = sh_mobile_lcdc_channel_init(priv, ch);

		if (error)

			goto err1;

	}
@@ -1837,7 +1838,7 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) 
		if (error < 0)

			goto err1;



		dev_info(info->dev, "registered %s/%s as %dx%d %dbpp.\n",

		dev_info(&pdev->dev, "registered %s/%s as %dx%d %dbpp.\n",

			 pdev->name, (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?

			 "mainlcd" : "sublcd", info->var.xres, info->var.yres,

			 info->var.bits_per_pixel);