[PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Sachin Kamat]

Build tested based on samsung/for_v3.8 branch of
git://linuxtv.org/snawrocki/media.git tree.

Sachin Kamat (9):
  [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
  [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
  [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
  [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
  [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
  [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
  [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
  [media] s5p-tv: Use devm_* APIs in mixer_drv.c
  [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv

 drivers/media/platform/s5p-tv/hdmi_drv.c    |   28 +++------
 drivers/media/platform/s5p-tv/hdmiphy_drv.c |    2 +-
 drivers/media/platform/s5p-tv/mixer_drv.c   |   87 +++++++--------------------
 drivers/media/platform/s5p-tv/mixer_reg.c   |    6 +-
 drivers/media/platform/s5p-tv/mixer_video.c |   18 +++---
 drivers/media/platform/s5p-tv/sdo_drv.c     |   43 ++++---------
 6 files changed, 57 insertions(+), 127 deletions(-)

-- 
1.7.4.1

[PATCH 1/9] [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c

[Sachin Kamat]

Silences the following checkpatch warnings:
WARNING: sizeof *sdev should be sizeof(*sdev)
FILE: media/platform/s5p-tv/sdo_drv.c:304:
	sdev = devm_kzalloc(&pdev->dev, sizeof *sdev, GFP_KERNEL);
WARNING: sizeof sdev->sd.name should be sizeof(sdev->sd.name)
FILE: media/platform/s5p-tv/sdo_drv.c:394:
	strlcpy(sdev->sd.name, "s5p-sdo", sizeof sdev->sd.name);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/sdo_drv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index ad68bbe..91e2de3 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -301,7 +301,7 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	struct clk *sclk_vpll;
 
 	dev_info(dev, "probe start\n");
-	sdev = devm_kzalloc(&pdev->dev, sizeof *sdev, GFP_KERNEL);
+	sdev = devm_kzalloc(&pdev->dev, sizeof(*sdev), GFP_KERNEL);
 	if (!sdev) {
 		dev_err(dev, "not enough memory.\n");
 		ret = -ENOMEM;
@@ -394,7 +394,7 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	/* configuration of interface subdevice */
 	v4l2_subdev_init(&sdev->sd, &sdo_sd_ops);
 	sdev->sd.owner = THIS_MODULE;
-	strlcpy(sdev->sd.name, "s5p-sdo", sizeof sdev->sd.name);
+	strlcpy(sdev->sd.name, "s5p-sdo", sizeof(sdev->sd.name));
 
 	/* set default format */
 	sdev->fmt = sdo_find_format(SDO_DEFAULT_STD);
-- 
1.7.4.1

[PATCH 2/9] [media] s5p-tv: Add missing braces around sizeof in mixer_video.c

[Sachin Kamat]

Silences several checkpatch warnings of the type:
WARNING: sizeof *out should be sizeof(*out)
FILE: media/platform/s5p-tv/mixer_video.c:98:
		out = kzalloc(sizeof *out, GFP_KERNEL);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/mixer_video.c |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
index 9b52f3a..155c092 100644
--- a/drivers/media/platform/s5p-tv/mixer_video.c
+++ b/drivers/media/platform/s5p-tv/mixer_video.c
@@ -95,7 +95,7 @@ int __devinit mxr_acquire_video(struct mxr_device *mdev,
 		/* trying to register next output */
 		if (sd == NULL)
 			continue;
-		out = kzalloc(sizeof *out, GFP_KERNEL);
+		out = kzalloc(sizeof(*out), GFP_KERNEL);
 		if (out == NULL) {
 			mxr_err(mdev, "no memory for '%s'\n",
 				conf->output_name);
@@ -127,7 +127,7 @@ fail_output:
 	/* kfree is NULL-safe */
 	for (i = 0; i < mdev->output_cnt; ++i)
 		kfree(mdev->output[i]);
-	memset(mdev->output, 0, sizeof mdev->output);
+	memset(mdev->output, 0, sizeof(mdev->output));
 
 fail_vb2_allocator:
 	/* freeing allocator context */
@@ -160,8 +160,8 @@ static int mxr_querycap(struct file *file, void *priv,
 
 	mxr_dbg(layer->mdev, "%s:%d\n", __func__, __LINE__);
 
-	strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof cap->driver);
-	strlcpy(cap->card, layer->vfd.name, sizeof cap->card);
+	strlcpy(cap->driver, MXR_DRIVER_NAME, sizeof(cap->driver));
+	strlcpy(cap->card, layer->vfd.name, sizeof(cap->card));
 	sprintf(cap->bus_info, "%d", layer->idx);
 	cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT_MPLANE;
 	cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
@@ -192,7 +192,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
 	struct mxr_device *mdev = layer->mdev;
 	struct v4l2_mbus_framefmt mbus_fmt;
 
-	memset(&layer->geo, 0, sizeof layer->geo);
+	memset(&layer->geo, 0, sizeof(layer->geo));
 
 	mxr_get_mbus_fmt(mdev, &mbus_fmt);
 
@@ -425,7 +425,7 @@ static int mxr_s_selection(struct file *file, void *fh,
 	struct mxr_geometry tmp;
 	struct v4l2_rect res;
 
-	memset(&res, 0, sizeof res);
+	memset(&res, 0, sizeof(res));
 
 	mxr_dbg(layer->mdev, "%s: rect: %dx%d@%d,%d\n", __func__,
 		s->r.width, s->r.height, s->r.left, s->r.top);
@@ -464,7 +464,7 @@ static int mxr_s_selection(struct file *file, void *fh,
 	/* apply change and update geometry if needed */
 	if (target) {
 		/* backup current geometry if setup fails */
-		memcpy(&tmp, geo, sizeof tmp);
+		memcpy(&tmp, geo, sizeof(tmp));
 
 		/* apply requested selection */
 		target->x_offset = s->r.left;
@@ -496,7 +496,7 @@ static int mxr_s_selection(struct file *file, void *fh,
 fail:
 	/* restore old geometry, which is not touched if target is NULL */
 	if (target)
-		memcpy(geo, &tmp, sizeof tmp);
+		memcpy(geo, &tmp, sizeof(tmp));
 	return -ERANGE;
 }
 
@@ -1061,7 +1061,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
 {
 	struct mxr_layer *layer;
 
-	layer = kzalloc(sizeof *layer, GFP_KERNEL);
+	layer = kzalloc(sizeof(*layer), GFP_KERNEL);
 	if (layer == NULL) {
 		mxr_err(mdev, "not enough memory for layer.\n");
 		goto fail;
-- 
1.7.4.1

[PATCH 3/9] [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c

[Sachin Kamat]

Silences checkpatch warnings of the type:
WARNING: sizeof filter_y_horiz_tap8 should be sizeof(filter_y_horiz_tap8)
FILE: media/platform/s5p-tv/mixer_reg.c:473:
		filter_y_horiz_tap8, sizeof filter_y_horiz_tap8);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/mixer_reg.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
index 3b1670a..b713403 100644
--- a/drivers/media/platform/s5p-tv/mixer_reg.c
+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
@@ -470,11 +470,11 @@ static inline void mxr_reg_vp_filter_set(struct mxr_device *mdev,
 static void mxr_reg_vp_default_filter(struct mxr_device *mdev)
 {
 	mxr_reg_vp_filter_set(mdev, VP_POLY8_Y0_LL,
-		filter_y_horiz_tap8, sizeof filter_y_horiz_tap8);
+		filter_y_horiz_tap8, sizeof(filter_y_horiz_tap8));
 	mxr_reg_vp_filter_set(mdev, VP_POLY4_Y0_LL,
-		filter_y_vert_tap4, sizeof filter_y_vert_tap4);
+		filter_y_vert_tap4, sizeof(filter_y_vert_tap4));
 	mxr_reg_vp_filter_set(mdev, VP_POLY4_C0_LL,
-		filter_cr_horiz_tap4, sizeof filter_cr_horiz_tap4);
+		filter_cr_horiz_tap4, sizeof(filter_cr_horiz_tap4));
 }
 
 static void mxr_reg_mxr_dump(struct mxr_device *mdev)
-- 
1.7.4.1

[PATCH 4/9] [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c

[Sachin Kamat]

Silences checkpatch warnings of type:
WARNING: sizeof mdev->res should be sizeof(mdev->res)
FILE: media/platform/s5p-tv/mixer_drv.c:301:
	memset(&mdev->res, 0, sizeof mdev->res);

WARNING: sizeof *mdev should be sizeof(*mdev)
FILE: media/platform/s5p-tv/mixer_drv.c:385:
	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/mixer_drv.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index ca0f297..a6dee4d 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -298,7 +298,7 @@ static void mxr_release_resources(struct mxr_device *mdev)
 {
 	mxr_release_clocks(mdev);
 	mxr_release_plat_resources(mdev);
-	memset(&mdev->res, 0, sizeof mdev->res);
+	memset(&mdev->res, 0, sizeof(mdev->res));
 }
 
 static void mxr_release_layers(struct mxr_device *mdev)
@@ -382,7 +382,7 @@ static int __devinit mxr_probe(struct platform_device *pdev)
 	/* mdev does not exist yet so no mxr_dbg is used */
 	dev_info(dev, "probe start\n");
 
-	mdev = kzalloc(sizeof *mdev, GFP_KERNEL);
+	mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
 	if (!mdev) {
 		dev_err(dev, "not enough memory.\n");
 		ret = -ENOMEM;
-- 
1.7.4.1

[PATCH 5/9] [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c

[Sachin Kamat]

Fixes the following checkpatch warning:
WARNING: sizeof *ctx should be sizeof(*ctx)
FILE: media/platform/s5p-tv/hdmiphy_drv.c:287:
	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/hdmiphy_drv.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/hdmiphy_drv.c b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
index f67b386..94c2a13 100644
--- a/drivers/media/platform/s5p-tv/hdmiphy_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmiphy_drv.c
@@ -284,7 +284,7 @@ static int __devinit hdmiphy_probe(struct i2c_client *client,
 {
 	struct hdmiphy_ctx *ctx;
 
-	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+	ctx = kzalloc(sizeof(*ctx), GFP_KERNEL);
 	if (!ctx)
 		return -ENOMEM;
 
-- 
1.7.4.1

[PATCH 6/9] [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c

[Sachin Kamat]

Fixes the following checkpatch warnings:

WARNING: sizeof *fmt should be sizeof(*fmt)
WARNING: sizeof *res should be sizeof(*res)
WARNING: sizeof *res should be sizeof(*res)
WARNING: sizeof sd->name should be sizeof(sd->name)

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/hdmi_drv.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 8a9cf43..c48eadf 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -656,7 +656,7 @@ static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd,
 	dev_dbg(hdev->dev, "%s\n", __func__);
 	if (!hdev->cur_conf)
 		return -EINVAL;
-	memset(fmt, 0, sizeof *fmt);
+	memset(fmt, 0, sizeof(*fmt));
 	fmt->width = t->hact.end - t->hact.beg;
 	fmt->height = t->vact[0].end - t->vact[0].beg;
 	fmt->code = V4L2_MBUS_FMT_FIXED; /* means RGB888 */
@@ -760,7 +760,7 @@ static void hdmi_resources_cleanup(struct hdmi_device *hdev)
 		clk_put(res->sclk_hdmi);
 	if (!IS_ERR_OR_NULL(res->hdmi))
 		clk_put(res->hdmi);
-	memset(res, 0, sizeof *res);
+	memset(res, 0, sizeof(*res));
 }
 
 static int hdmi_resources_init(struct hdmi_device *hdev)
@@ -777,7 +777,7 @@ static int hdmi_resources_init(struct hdmi_device *hdev)
 
 	dev_dbg(dev, "HDMI resource init\n");
 
-	memset(res, 0, sizeof *res);
+	memset(res, 0, sizeof(*res));
 	/* get clocks, power */
 
 	res->hdmi = clk_get(dev, "hdmi");
@@ -955,7 +955,7 @@ static int __devinit hdmi_probe(struct platform_device *pdev)
 	v4l2_subdev_init(sd, &hdmi_sd_ops);
 	sd->owner = THIS_MODULE;
 
-	strlcpy(sd->name, "s5p-hdmi", sizeof sd->name);
+	strlcpy(sd->name, "s5p-hdmi", sizeof(sd->name));
 	hdmi_dev->cur_preset = HDMI_DEFAULT_PRESET;
 	/* FIXME: missing fail preset is not supported */
 	hdmi_dev->cur_conf = hdmi_preset2timings(hdmi_dev->cur_preset);
-- 
1.7.4.1

[PATCH 7/9] [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c

[Sachin Kamat]

devm_clk_get() is device managed function and makes error handling
and exit code a bit simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/sdo_drv.c |   39 +++++++++---------------------
 1 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index 91e2de3..9e78adf 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -340,36 +340,33 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	sdev->irq = res->start;
 
 	/* acquire clocks */
-	sdev->sclk_dac = clk_get(dev, "sclk_dac");
+	sdev->sclk_dac = devm_clk_get(dev, "sclk_dac");
 	if (IS_ERR_OR_NULL(sdev->sclk_dac)) {
 		dev_err(dev, "failed to get clock 'sclk_dac'\n");
 		ret = -ENXIO;
 		goto fail;
 	}
-	sdev->dac = clk_get(dev, "dac");
+	sdev->dac = devm_clk_get(dev, "dac");
 	if (IS_ERR_OR_NULL(sdev->dac)) {
 		dev_err(dev, "failed to get clock 'dac'\n");
-		ret = -ENXIO;
-		goto fail_sclk_dac;
+		return -ENXIO;
 	}
-	sdev->dacphy = clk_get(dev, "dacphy");
+	sdev->dacphy = devm_clk_get(dev, "dacphy");
 	if (IS_ERR_OR_NULL(sdev->dacphy)) {
 		dev_err(dev, "failed to get clock 'dacphy'\n");
-		ret = -ENXIO;
-		goto fail_dac;
+		return -ENXIO;
 	}
-	sclk_vpll = clk_get(dev, "sclk_vpll");
+	sclk_vpll = devm_clk_get(dev, "sclk_vpll");
 	if (IS_ERR_OR_NULL(sclk_vpll)) {
 		dev_err(dev, "failed to get clock 'sclk_vpll'\n");
-		ret = -ENXIO;
-		goto fail_dacphy;
+		return -ENXIO;
 	}
 	clk_set_parent(sdev->sclk_dac, sclk_vpll);
-	clk_put(sclk_vpll);
-	sdev->fout_vpll = clk_get(dev, "fout_vpll");
+	devm_clk_put(dev, sclk_vpll);
+	sdev->fout_vpll = devm_clk_get(dev, "fout_vpll");
 	if (IS_ERR_OR_NULL(sdev->fout_vpll)) {
 		dev_err(dev, "failed to get clock 'fout_vpll'\n");
-		goto fail_dacphy;
+		return -ENXIO;
 	}
 	dev_info(dev, "fout_vpll.rate = %lu\n", clk_get_rate(sclk_vpll));
 
@@ -377,12 +374,12 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	sdev->vdac = devm_regulator_get(dev, "vdd33a_dac");
 	if (IS_ERR_OR_NULL(sdev->vdac)) {
 		dev_err(dev, "failed to get regulator 'vdac'\n");
-		goto fail_fout_vpll;
+		goto fail;
 	}
 	sdev->vdet = devm_regulator_get(dev, "vdet");
 	if (IS_ERR_OR_NULL(sdev->vdet)) {
 		dev_err(dev, "failed to get regulator 'vdet'\n");
-		goto fail_fout_vpll;
+		goto fail;
 	}
 
 	/* enable gate for dac clock, because mixer uses it */
@@ -406,14 +403,6 @@ static int __devinit sdo_probe(struct platform_device *pdev)
 	dev_info(dev, "probe succeeded\n");
 	return 0;
 
-fail_fout_vpll:
-	clk_put(sdev->fout_vpll);
-fail_dacphy:
-	clk_put(sdev->dacphy);
-fail_dac:
-	clk_put(sdev->dac);
-fail_sclk_dac:
-	clk_put(sdev->sclk_dac);
 fail:
 	dev_info(dev, "probe failed\n");
 	return ret;
@@ -426,10 +415,6 @@ static int __devexit sdo_remove(struct platform_device *pdev)
 
 	pm_runtime_disable(&pdev->dev);
 	clk_disable(sdev->dac);
-	clk_put(sdev->fout_vpll);
-	clk_put(sdev->dacphy);
-	clk_put(sdev->dac);
-	clk_put(sdev->sclk_dac);
 
 	dev_info(&pdev->dev, "remove successful\n");
 	return 0;
-- 
1.7.4.1

[PATCH 8/9] [media] s5p-tv: Use devm_* APIs in mixer_drv.c

[Sachin Kamat]

devm_* APIs are device managed and make error handling and
cleanup simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/mixer_drv.c |   85 +++++++----------------------
 1 files changed, 20 insertions(+), 65 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/mixer_drv.c b/drivers/media/platform/s5p-tv/mixer_drv.c
index a6dee4d..279e395 100644
--- a/drivers/media/platform/s5p-tv/mixer_drv.c
+++ b/drivers/media/platform/s5p-tv/mixer_drv.c
@@ -160,78 +160,44 @@ static int __devinit mxr_acquire_plat_resources(struct mxr_device *mdev,
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mxr");
 	if (res == NULL) {
 		mxr_err(mdev, "get memory resource failed.\n");
-		ret = -ENXIO;
-		goto fail;
+		return -ENXIO;
 	}
 
-	mdev->res.mxr_regs = ioremap(res->start, resource_size(res));
+	mdev->res.mxr_regs = devm_ioremap(&pdev->dev, res->start,
+					  resource_size(res));
 	if (mdev->res.mxr_regs == NULL) {
 		mxr_err(mdev, "register mapping failed.\n");
-		ret = -ENXIO;
-		goto fail;
+		return -ENXIO;
 	}
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "vp");
 	if (res == NULL) {
 		mxr_err(mdev, "get memory resource failed.\n");
-		ret = -ENXIO;
-		goto fail_mxr_regs;
+		return -ENXIO;
 	}
 
-	mdev->res.vp_regs = ioremap(res->start, resource_size(res));
+	mdev->res.vp_regs = devm_ioremap(&pdev->dev, res->start,
+					 resource_size(res));
 	if (mdev->res.vp_regs == NULL) {
 		mxr_err(mdev, "register mapping failed.\n");
-		ret = -ENXIO;
-		goto fail_mxr_regs;
+		return -ENXIO;
 	}
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "irq");
 	if (res == NULL) {
 		mxr_err(mdev, "get interrupt resource failed.\n");
-		ret = -ENXIO;
-		goto fail_vp_regs;
+		return -ENXIO;
 	}
 
-	ret = request_irq(res->start, mxr_irq_handler, 0, "s5p-mixer", mdev);
+	ret = devm_request_irq(&pdev->dev, res->start, mxr_irq_handler, 0,
+				"s5p-mixer", mdev);
 	if (ret) {
 		mxr_err(mdev, "request interrupt failed.\n");
-		goto fail_vp_regs;
+		return ret;
 	}
 	mdev->res.irq = res->start;
 
 	return 0;
-
-fail_vp_regs:
-	iounmap(mdev->res.vp_regs);
-
-fail_mxr_regs:
-	iounmap(mdev->res.mxr_regs);
-
-fail:
-	return ret;
-}
-
-static void mxr_release_plat_resources(struct mxr_device *mdev)
-{
-	free_irq(mdev->res.irq, mdev);
-	iounmap(mdev->res.vp_regs);
-	iounmap(mdev->res.mxr_regs);
-}
-
-static void mxr_release_clocks(struct mxr_device *mdev)
-{
-	struct mxr_resources *res = &mdev->res;
-
-	if (!IS_ERR_OR_NULL(res->sclk_dac))
-		clk_put(res->sclk_dac);
-	if (!IS_ERR_OR_NULL(res->sclk_hdmi))
-		clk_put(res->sclk_hdmi);
-	if (!IS_ERR_OR_NULL(res->sclk_mixer))
-		clk_put(res->sclk_mixer);
-	if (!IS_ERR_OR_NULL(res->vp))
-		clk_put(res->vp);
-	if (!IS_ERR_OR_NULL(res->mixer))
-		clk_put(res->mixer);
 }
 
 static int mxr_acquire_clocks(struct mxr_device *mdev)
@@ -239,27 +205,27 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
 	struct mxr_resources *res = &mdev->res;
 	struct device *dev = mdev->dev;
 
-	res->mixer = clk_get(dev, "mixer");
+	res->mixer = devm_clk_get(dev, "mixer");
 	if (IS_ERR_OR_NULL(res->mixer)) {
 		mxr_err(mdev, "failed to get clock 'mixer'\n");
 		goto fail;
 	}
-	res->vp = clk_get(dev, "vp");
+	res->vp = devm_clk_get(dev, "vp");
 	if (IS_ERR_OR_NULL(res->vp)) {
 		mxr_err(mdev, "failed to get clock 'vp'\n");
 		goto fail;
 	}
-	res->sclk_mixer = clk_get(dev, "sclk_mixer");
+	res->sclk_mixer = devm_clk_get(dev, "sclk_mixer");
 	if (IS_ERR_OR_NULL(res->sclk_mixer)) {
 		mxr_err(mdev, "failed to get clock 'sclk_mixer'\n");
 		goto fail;
 	}
-	res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
+	res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi");
 	if (IS_ERR_OR_NULL(res->sclk_hdmi)) {
 		mxr_err(mdev, "failed to get clock 'sclk_hdmi'\n");
 		goto fail;
 	}
-	res->sclk_dac = clk_get(dev, "sclk_dac");
+	res->sclk_dac = devm_clk_get(dev, "sclk_dac");
 	if (IS_ERR_OR_NULL(res->sclk_dac)) {
 		mxr_err(mdev, "failed to get clock 'sclk_dac'\n");
 		goto fail;
@@ -267,7 +233,6 @@ static int mxr_acquire_clocks(struct mxr_device *mdev)
 
 	return 0;
 fail:
-	mxr_release_clocks(mdev);
 	return -ENODEV;
 }
 
@@ -276,19 +241,16 @@ static int __devinit mxr_acquire_resources(struct mxr_device *mdev,
 {
 	int ret;
 	ret = mxr_acquire_plat_resources(mdev, pdev);
-
 	if (ret)
 		goto fail;
 
 	ret = mxr_acquire_clocks(mdev);
 	if (ret)
-		goto fail_plat;
+		goto fail;
 
 	mxr_info(mdev, "resources acquired\n");
 	return 0;
 
-fail_plat:
-	mxr_release_plat_resources(mdev);
 fail:
 	mxr_err(mdev, "resources acquire failed\n");
 	return ret;
@@ -296,8 +258,6 @@ fail:
 
 static void mxr_release_resources(struct mxr_device *mdev)
 {
-	mxr_release_clocks(mdev);
-	mxr_release_plat_resources(mdev);
 	memset(&mdev->res, 0, sizeof(mdev->res));
 }
 
@@ -382,7 +342,7 @@ static int __devinit mxr_probe(struct platform_device *pdev)
 	/* mdev does not exist yet so no mxr_dbg is used */
 	dev_info(dev, "probe start\n");
 
-	mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+	mdev = devm_kzalloc(dev, sizeof(*mdev), GFP_KERNEL);
 	if (!mdev) {
 		dev_err(dev, "not enough memory.\n");
 		ret = -ENOMEM;
@@ -399,7 +359,7 @@ static int __devinit mxr_probe(struct platform_device *pdev)
 	/* acquire resources: regs, irqs, clocks, regulators */
 	ret = mxr_acquire_resources(mdev, pdev);
 	if (ret)
-		goto fail_mem;
+		goto fail;
 
 	/* configure resources for video output */
 	ret = mxr_acquire_video(mdev, mxr_output_conf,
@@ -423,9 +383,6 @@ fail_video:
 fail_resources:
 	mxr_release_resources(mdev);
 
-fail_mem:
-	kfree(mdev);
-
 fail:
 	dev_info(dev, "probe failed\n");
 	return ret;
@@ -442,8 +399,6 @@ static int __devexit mxr_remove(struct platform_device *pdev)
 	mxr_release_video(mdev);
 	mxr_release_resources(mdev);
 
-	kfree(mdev);
-
 	dev_info(dev, "remove successful\n");
 	return 0;
 }
-- 
1.7.4.1

[PATCH 9/9] [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv

[Sachin Kamat]

devm_clk_get() is device managed and makes error handling
and cleanup a bit simpler.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 drivers/media/platform/s5p-tv/hdmi_drv.c |   20 +++++---------------
 1 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index c48eadf..ae3bc28 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -750,16 +750,6 @@ static void hdmi_resources_cleanup(struct hdmi_device *hdev)
 		regulator_bulk_free(res->regul_count, res->regul_bulk);
 	/* kfree is NULL-safe */
 	kfree(res->regul_bulk);
-	if (!IS_ERR_OR_NULL(res->hdmiphy))
-		clk_put(res->hdmiphy);
-	if (!IS_ERR_OR_NULL(res->sclk_hdmiphy))
-		clk_put(res->sclk_hdmiphy);
-	if (!IS_ERR_OR_NULL(res->sclk_pixel))
-		clk_put(res->sclk_pixel);
-	if (!IS_ERR_OR_NULL(res->sclk_hdmi))
-		clk_put(res->sclk_hdmi);
-	if (!IS_ERR_OR_NULL(res->hdmi))
-		clk_put(res->hdmi);
 	memset(res, 0, sizeof(*res));
 }
 
@@ -780,27 +770,27 @@ static int hdmi_resources_init(struct hdmi_device *hdev)
 	memset(res, 0, sizeof(*res));
 	/* get clocks, power */
 
-	res->hdmi = clk_get(dev, "hdmi");
+	res->hdmi = devm_clk_get(dev, "hdmi");
 	if (IS_ERR_OR_NULL(res->hdmi)) {
 		dev_err(dev, "failed to get clock 'hdmi'\n");
 		goto fail;
 	}
-	res->sclk_hdmi = clk_get(dev, "sclk_hdmi");
+	res->sclk_hdmi = devm_clk_get(dev, "sclk_hdmi");
 	if (IS_ERR_OR_NULL(res->sclk_hdmi)) {
 		dev_err(dev, "failed to get clock 'sclk_hdmi'\n");
 		goto fail;
 	}
-	res->sclk_pixel = clk_get(dev, "sclk_pixel");
+	res->sclk_pixel = devm_clk_get(dev, "sclk_pixel");
 	if (IS_ERR_OR_NULL(res->sclk_pixel)) {
 		dev_err(dev, "failed to get clock 'sclk_pixel'\n");
 		goto fail;
 	}
-	res->sclk_hdmiphy = clk_get(dev, "sclk_hdmiphy");
+	res->sclk_hdmiphy = devm_clk_get(dev, "sclk_hdmiphy");
 	if (IS_ERR_OR_NULL(res->sclk_hdmiphy)) {
 		dev_err(dev, "failed to get clock 'sclk_hdmiphy'\n");
 		goto fail;
 	}
-	res->hdmiphy = clk_get(dev, "hdmiphy");
+	res->hdmiphy = devm_clk_get(dev, "hdmiphy");
 	if (IS_ERR_OR_NULL(res->hdmiphy)) {
 		dev_err(dev, "failed to get clock 'hdmiphy'\n");
 		goto fail;
-- 
1.7.4.1

Re: [PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Sylwester Nawrocki]

On 11/26/2012 05:48 AM, Sachin Kamat wrote:
> Build tested based on samsung/for_v3.8 branch of
> git://linuxtv.org/snawrocki/media.git tree.

How about testing it on Origen board ?

Tomasz, are you OK with this patch series ?

As a side note, for v3.9, when common clock framework support for the Exynos
platforms is merged this driver will need to have clk_(un)prepare added.
It will fail to initialize otherwise.

> Sachin Kamat (9):
>    [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
>    [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
>    [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
>    [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
>    [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
>    [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
>    [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
>    [media] s5p-tv: Use devm_* APIs in mixer_drv.c
>    [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv
>
>   drivers/media/platform/s5p-tv/hdmi_drv.c    |   28 +++------
>   drivers/media/platform/s5p-tv/hdmiphy_drv.c |    2 +-
>   drivers/media/platform/s5p-tv/mixer_drv.c   |   87 +++++++--------------------
>   drivers/media/platform/s5p-tv/mixer_reg.c   |    6 +-
>   drivers/media/platform/s5p-tv/mixer_video.c |   18 +++---
>   drivers/media/platform/s5p-tv/sdo_drv.c     |   43 ++++---------
>   6 files changed, 57 insertions(+), 127 deletions(-)

--

Thanks,
Sylwester

Re: [PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Sachin Kamat]

On 28 November 2012 04:57, Sylwester Nawrocki
<sylvester.nawrocki@gmail.com> wrote:
> On 11/26/2012 05:48 AM, Sachin Kamat wrote:
>>
>> Build tested based on samsung/for_v3.8 branch of
>> git://linuxtv.org/snawrocki/media.git tree.
>
>
> How about testing it on Origen board ?

I wanted to but could not due to hardware setup problem.
I will see if I can get it up today (I am off for the rest of the week).

>
> Tomasz, are you OK with this patch series ?
>
> As a side note, for v3.9, when common clock framework support for the Exynos
> platforms is merged this driver will need to have clk_(un)prepare added.
> It will fail to initialize otherwise.
>
>
>> Sachin Kamat (9):
>>    [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
>>    [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
>>    [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
>>    [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
>>    [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
>>    [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
>>    [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
>>    [media] s5p-tv: Use devm_* APIs in mixer_drv.c
>>    [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv
>>
>>   drivers/media/platform/s5p-tv/hdmi_drv.c    |   28 +++------
>>   drivers/media/platform/s5p-tv/hdmiphy_drv.c |    2 +-
>>   drivers/media/platform/s5p-tv/mixer_drv.c   |   87
>> +++++++--------------------
>>   drivers/media/platform/s5p-tv/mixer_reg.c   |    6 +-
>>   drivers/media/platform/s5p-tv/mixer_video.c |   18 +++---
>>   drivers/media/platform/s5p-tv/sdo_drv.c     |   43 ++++---------
>>   6 files changed, 57 insertions(+), 127 deletions(-)
>
>
> --
>
> Thanks,
> Sylwester



-- 
With warm regards,
Sachin

Re: [PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Sachin Kamat]

Hi Sylwester,

On 28 November 2012 09:04, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> On 28 November 2012 04:57, Sylwester Nawrocki
> <sylvester.nawrocki@gmail.com> wrote:
>> On 11/26/2012 05:48 AM, Sachin Kamat wrote:
>>>
>>> Build tested based on samsung/for_v3.8 branch of
>>> git://linuxtv.org/snawrocki/media.git tree.
>>
>>
>> How about testing it on Origen board ?
>
> I wanted to but could not due to hardware setup problem.
> I will see if I can get it up today (I am off for the rest of the week).

Tested this series with test application on Origen. Works fine.

>
>>
>> Tomasz, are you OK with this patch series ?
>>
>> As a side note, for v3.9, when common clock framework support for the Exynos
>> platforms is merged this driver will need to have clk_(un)prepare added.
>> It will fail to initialize otherwise.
>>
>>
>>> Sachin Kamat (9):
>>>    [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
>>>    [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
>>>    [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
>>>    [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
>>>    [media] s5p-tv: Use devm_* APIs in mixer_drv.c
>>>    [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv
>>>
>>>   drivers/media/platform/s5p-tv/hdmi_drv.c    |   28 +++------
>>>   drivers/media/platform/s5p-tv/hdmiphy_drv.c |    2 +-
>>>   drivers/media/platform/s5p-tv/mixer_drv.c   |   87
>>> +++++++--------------------
>>>   drivers/media/platform/s5p-tv/mixer_reg.c   |    6 +-
>>>   drivers/media/platform/s5p-tv/mixer_video.c |   18 +++---
>>>   drivers/media/platform/s5p-tv/sdo_drv.c     |   43 ++++---------
>>>   6 files changed, 57 insertions(+), 127 deletions(-)
>>
>>
>> --
>>
>> Thanks,
>> Sylwester
>
>
>
> --
> With warm regards,
> Sachin



-- 
With warm regards,
Sachin

Re: [PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Sachin Kamat]

On 28 November 2012 11:33, Sachin Kamat <sachin.kamat@linaro.org> wrote:

>>> How about testing it on Origen board ?
>>
>> I wanted to but could not due to hardware setup problem.
>> I will see if I can get it up today (I am off for the rest of the week).
>
> Tested this series with test application on Origen. Works fine.
>
>>
>>>
>>> Tomasz, are you OK with this patch series ?

Hi Tomasz,

Any comments on this series?

Regards,
Sachin


>>>
>>>
>>>> Sachin Kamat (9):
>>>>    [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
>>>>    [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
>>>>    [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
>>>>    [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
>>>>    [media] s5p-tv: Use devm_* APIs in mixer_drv.c
>>>>    [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv
>>>>



-- 
With warm regards,
Sachin

Re: [PATCH 0/9] [media] s5p-tv: Checkpatch Fixes and cleanup

[Tomasz Stanislawski]

On 12/03/2012 05:28 AM, Sachin Kamat wrote:
> On 28 November 2012 11:33, Sachin Kamat <sachin.kamat@linaro.org> wrote:
> 
>>>> How about testing it on Origen board ?
>>>
>>> I wanted to but could not due to hardware setup problem.
>>> I will see if I can get it up today (I am off for the rest of the week).
>>
>> Tested this series with test application on Origen. Works fine.
>>
>>>
>>>>
>>>> Tomasz, are you OK with this patch series ?

Hi Sachin Kamat,
I am OK with patches from "s5p-tv: Add missing braces around sizeof in ..." family.
You can add my Acked-by to them.

The devm_clk patches should be postponed until s5p-tv gets integrated with
clk_prepare/unprepare stuff.

Regards,
Tomasz Stanislawski


> 
> Hi Tomasz,
> 
> Any comments on this series?
> 
> Regards,
> Sachin
> 
> 
>>>>
>>>>
>>>>> Sachin Kamat (9):
>>>>>    [media] s5p-tv: Add missing braces around sizeof in sdo_drv.c
>>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_video.c
>>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_reg.c
>>>>>    [media] s5p-tv: Add missing braces around sizeof in mixer_drv.c
>>>>>    [media] s5p-tv: Add missing braces around sizeof in hdmiphy_drv.c
>>>>>    [media] s5p-tv: Add missing braces around sizeof in hdmi_drv.c
>>>>>    [media] s5p-tv: Use devm_clk_get APIs in sdo_drv.c
>>>>>    [media] s5p-tv: Use devm_* APIs in mixer_drv.c
>>>>>    [media] s5p-tv: Use devm_clk_get APIs in hdmi_drv
>>>>>
> 
> 
>