[PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk

[PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk

[Sachin Kamat]

Use mfc_err for consistency. Also silences checkpatch warning.

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

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index bf7d010..bb99d3d 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -187,8 +187,7 @@ int s5p_mfc_alloc_codec_buffers_v5(struct s5p_mfc_ctx *ctx)
 		dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size);
 		if (IS_ERR(ctx->bank1_buf)) {
 			ctx->bank1_buf = NULL;
-			printk(KERN_ERR
-			       "Buf alloc for decoding failed (port A)\n");
+			mfc_err("Buf alloc for decoding failed (port A)\n");
 			return -ENOMEM;
 		}
 		ctx->bank1_phys = s5p_mfc_mem_cookie(
-- 
1.7.4.1

[PATCH 2/3] [media] s5p-mfc: Remove redundant 'break'

[Sachin Kamat]

The code returns before this statement. Hence not required.
Silences the following smatch message:
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c:525
s5p_mfc_set_dec_frame_buffer_v5() info: ignoring unreachable code.

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

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index bb99d3d..b0f277e 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -522,7 +522,6 @@ int s5p_mfc_set_dec_frame_buffer_v5(struct s5p_mfc_ctx *ctx)
 		mfc_err("Unknown codec for decoding (%x)\n",
 			ctx->codec_mode);
 		return -EINVAL;
-		break;
 	}
 	frame_size = ctx->luma_size;
 	frame_size_ch = ctx->chroma_size;
-- 
1.7.4.1

RE: [PATCH 2/3] [media] s5p-mfc: Remove redundant 'break'

[Kamil Debski]

Hi Sachin,

Thank you for your patch.

Best wishes,
-- 
Kamil Debski
Linux Platform Group
Samsung Poland R&D Center

> -----Original Message-----
> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
> owner@vger.kernel.org] On Behalf Of Sachin Kamat
> Sent: Friday, December 28, 2012 11:18 AM
> To: linux-media@vger.kernel.org
> Cc: k.debski@samsung.com; s.nawrocki@samsung.com;
> sylvester.nawrocki@gmail.com; sachin.kamat@linaro.org;
> patches@linaro.org
> Subject: [PATCH 2/3] [media] s5p-mfc: Remove redundant 'break'
> 
> The code returns before this statement. Hence not required.
> Silences the following smatch message:
> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c:525
> s5p_mfc_set_dec_frame_buffer_v5() info: ignoring unreachable code.
> 
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> index bb99d3d..b0f277e 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> @@ -522,7 +522,6 @@ int s5p_mfc_set_dec_frame_buffer_v5(struct
> s5p_mfc_ctx *ctx)
>  		mfc_err("Unknown codec for decoding (%x)\n",
>  			ctx->codec_mode);
>  		return -EINVAL;
> -		break;
>  	}
>  	frame_size = ctx->luma_size;
>  	frame_size_ch = ctx->chroma_size;
> --
> 1.7.4.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media"
> in the body of a message to majordomo@vger.kernel.org More majordomo
> info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/3] [media] s5p-mfc: Remove redundant 'break'

[Sachin Kamat]

Thanks Kamil.

I assume you have 'Acked' this patch as well :)

On 2 January 2013 23:59, Kamil Debski <k.debski@samsung.com> wrote:
> Hi Sachin,
>
> Thank you for your patch.
>
> Best wishes,
> --
> Kamil Debski
> Linux Platform Group
> Samsung Poland R&D Center
>
>> -----Original Message-----
>> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
>> owner@vger.kernel.org] On Behalf Of Sachin Kamat
>> Sent: Friday, December 28, 2012 11:18 AM
>> To: linux-media@vger.kernel.org
>> Cc: k.debski@samsung.com; s.nawrocki@samsung.com;
>> sylvester.nawrocki@gmail.com; sachin.kamat@linaro.org;
>> patches@linaro.org
>> Subject: [PATCH 2/3] [media] s5p-mfc: Remove redundant 'break'
>>
>> The code returns before this statement. Hence not required.
>> Silences the following smatch message:
>> drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c:525
>> s5p_mfc_set_dec_frame_buffer_v5() info: ignoring unreachable code.
>>
>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>> ---
>>  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c |    1 -
>>  1 files changed, 0 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
>> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
>> index bb99d3d..b0f277e 100644
>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
>> @@ -522,7 +522,6 @@ int s5p_mfc_set_dec_frame_buffer_v5(struct
>> s5p_mfc_ctx *ctx)
>>               mfc_err("Unknown codec for decoding (%x)\n",
>>                       ctx->codec_mode);
>>               return -EINVAL;
>> -             break;
>>       }
>>       frame_size = ctx->luma_size;
>>       frame_size_ch = ctx->chroma_size;
>> --
>> 1.7.4.1
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-media"
>> in the body of a message to majordomo@vger.kernel.org More majordomo
>> info at  http://vger.kernel.org/majordomo-info.html
>
>



-- 
With warm regards,
Sachin

[PATCH 3/3] [media] s5p-mfc: Use of_match_ptr and CONFIG_OF

[Sachin Kamat]

This builds the code only if DT is enabled.

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

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 3930177..65ed603 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1405,6 +1405,7 @@ static struct platform_device_id mfc_driver_ids[] = {
 };
 MODULE_DEVICE_TABLE(platform, mfc_driver_ids);
 
+#ifdef CONFIG_OF
 static const struct of_device_id exynos_mfc_match[] = {
 	{
 		.compatible = "samsung,mfc-v5",
@@ -1416,6 +1417,7 @@ static const struct of_device_id exynos_mfc_match[] = {
 	{},
 };
 MODULE_DEVICE_TABLE(of, exynos_mfc_match);
+#endif
 
 static void *mfc_get_drv_data(struct platform_device *pdev)
 {
@@ -1442,7 +1444,7 @@ static struct platform_driver s5p_mfc_driver = {
 		.name	= S5P_MFC_NAME,
 		.owner	= THIS_MODULE,
 		.pm	= &s5p_mfc_pm_ops,
-		.of_match_table = exynos_mfc_match,
+		.of_match_table = of_match_ptr(exynos_mfc_match),
 	},
 };
 
-- 
1.7.4.1

Re: [PATCH 3/3] [media] s5p-mfc: Use of_match_ptr and CONFIG_OF

[Sylwester Nawrocki]

Hi Sachin,

On 12/28/2012 11:18 AM, Sachin Kamat wrote:
> This builds the code only if DT is enabled.

Since the driver this patch touches is for platforms that in (not distant)
future will be DT only I don't really see an advantage of applying it,
only to need to revert it after few kernel releases.

I realize this exynos_mfc_match[] array's size is ~400 B, but still I'd
prefer to avoid such #ifdefs.

> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
> ---
>   drivers/media/platform/s5p-mfc/s5p_mfc.c |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> index 3930177..65ed603 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
> @@ -1405,6 +1405,7 @@ static struct platform_device_id mfc_driver_ids[] = {
>   };
>   MODULE_DEVICE_TABLE(platform, mfc_driver_ids);
>
> +#ifdef CONFIG_OF
>   static const struct of_device_id struct of_device_id[] = {
>   	{
>   		.compatible = "samsung,mfc-v5",
> @@ -1416,6 +1417,7 @@ static const struct of_device_id exynos_mfc_match[] = {
>   	{},
>   };
>   MODULE_DEVICE_TABLE(of, exynos_mfc_match);
> +#endif


>   static void *mfc_get_drv_data(struct platform_device *pdev)
>   {
> @@ -1442,7 +1444,7 @@ static struct platform_driver s5p_mfc_driver = {
>   		.name	= S5P_MFC_NAME,
>   		.owner	= THIS_MODULE,
>   		.pm	=&s5p_mfc_pm_ops,
> -		.of_match_table = exynos_mfc_match,
> +		.of_match_table = of_match_ptr(exynos_mfc_match),
>   	},
>   };
>

Thanks,
Sylwester

RE: [PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk

[Kamil Debski]

Hi Sachin,

Thank you for your patch.

Best wishes,
-- 
Kamil Debski
Linux Platform Group
Samsung Poland R&D Center

> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
> owner@vger.kernel.org] On Behalf Of Sachin Kamat
> Sent: Friday, December 28, 2012 11:18 AM
> To: linux-media@vger.kernel.org
> Cc: k.debski@samsung.com; s.nawrocki@samsung.com;
> sylvester.nawrocki@gmail.com; sachin.kamat@linaro.org;
> patches@linaro.org
> Subject: [PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk
> 
> Use mfc_err for consistency. Also silences checkpatch warning.
> 

Acked-by: Kamil Debski <k.debski@samsung.com>

> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
> ---
>  drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> index bf7d010..bb99d3d 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
> @@ -187,8 +187,7 @@ int s5p_mfc_alloc_codec_buffers_v5(struct
> s5p_mfc_ctx *ctx)
>  		dev->alloc_ctx[MFC_BANK1_ALLOC_CTX], ctx->bank1_size);
>  		if (IS_ERR(ctx->bank1_buf)) {
>  			ctx->bank1_buf = NULL;
> -			printk(KERN_ERR
> -			       "Buf alloc for decoding failed (port A)\n");
> +			mfc_err("Buf alloc for decoding failed (port A)\n");
>  			return -ENOMEM;
>  		}
>  		ctx->bank1_phys = s5p_mfc_mem_cookie(
> --
> 1.7.4.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media"
> in the body of a message to majordomo@vger.kernel.org More majordomo
> info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk

[Sylwester Nawrocki]

Hi Sachin,

On 01/07/2013 05:09 AM, Sachin Kamat wrote:
> Hi Sylwester,
> 
> On 3 January 2013 00:00, Kamil Debski <k.debski@samsung.com> wrote:
>> Hi Sachin,
>>
>> Thank you for your patch.
>>
>> Best wishes,
>> --
>> Kamil Debski
>> Linux Platform Group
>> Samsung Poland R&D Center
>>
>>> From: linux-media-owner@vger.kernel.org [mailto:linux-media-
>>> owner@vger.kernel.org] On Behalf Of Sachin Kamat
>>> Sent: Friday, December 28, 2012 11:18 AM
>>> To: linux-media@vger.kernel.org
>>> Cc: k.debski@samsung.com; s.nawrocki@samsung.com;
>>> sylvester.nawrocki@gmail.com; sachin.kamat@linaro.org;
>>> patches@linaro.org
>>> Subject: [PATCH 1/3] [media] s5p-mfc: use mfc_err instead of printk
>>>
>>> Use mfc_err for consistency. Also silences checkpatch warning.
>>>
>>
>> Acked-by: Kamil Debski <k.debski@samsung.com>
>>
>>> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
>>> ---
> 
> Probably you missed to apply this patch to your tree.

Hmm, not really, I intended it for a second v3.9 pull request.
However I checked it yesterday and it doesn't apply any more.
Since one of Kamil's patches includes same change.

Thanks,
Sylwester