diff mbox

[1/1,media] exynos4-is: Remove redundant NULL check in fimc-lite.c

Message ID 5180E05C.7020206@gmail.com
State New
Headers show

Commit Message

Sylwester Nawrocki May 1, 2013, 9:29 a.m. UTC 
Sachin,

On 04/30/2013 06:51 AM, Sachin Kamat wrote:
> clk_unprepare checks for NULL pointer. Hence convert IS_ERR_OR_NULL
> to IS_ERR only.
>
> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
> ---
>   drivers/media/platform/exynos4-is/fimc-lite.c |    2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
> index 661d0d1..2a0ef82 100644
> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
> @@ -1416,7 +1416,7 @@ static void fimc_lite_unregister_capture_subdev(struct fimc_lite *fimc)
>
>   static void fimc_lite_clk_put(struct fimc_lite *fimc)
>   {
> -	if (IS_ERR_OR_NULL(fimc->clock))
> +	if (IS_ERR(fimc->clock))
>   		return;
>
>   	clk_unprepare(fimc->clock);

I've queued this patch for 3.11 with the below chunk squashed to it:


Thanks.
Sylwester

Comments

Sachin Kamat May 2, 2013, 4:19 a.m. UTC | #1 
On 1 May 2013 14:59, Sylwester Nawrocki <sylvester.nawrocki@gmail.com> wrote:
> Sachin,
>
>
> On 04/30/2013 06:51 AM, Sachin Kamat wrote:
>>
>> clk_unprepare checks for NULL pointer. Hence convert IS_ERR_OR_NULL
>> to IS_ERR only.
>>
>> Signed-off-by: Sachin Kamat<sachin.kamat@linaro.org>
>> ---
>>   drivers/media/platform/exynos4-is/fimc-lite.c |    2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c
>> b/drivers/media/platform/exynos4-is/fimc-lite.c
>> index 661d0d1..2a0ef82 100644
>> --- a/drivers/media/platform/exynos4-is/fimc-lite.c
>> +++ b/drivers/media/platform/exynos4-is/fimc-lite.c
>> @@ -1416,7 +1416,7 @@ static void
>> fimc_lite_unregister_capture_subdev(struct fimc_lite *fimc)
>>
>>   static void fimc_lite_clk_put(struct fimc_lite *fimc)
>>   {
>> -       if (IS_ERR_OR_NULL(fimc->clock))
>> +       if (IS_ERR(fimc->clock))
>>                 return;
>>
>>         clk_unprepare(fimc->clock);
>
>
> I've queued this patch for 3.11 with the below chunk squashed to it:

Thanks Sylwester.
diff mbox

Patch

diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c 
b/drivers/media/platform/exynos4-is/fimc-lite.c
index 2ede148..faf2a75 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -1422,7 +1422,7 @@  static void fimc_lite_clk_put(struct fimc_lite *fimc)

         clk_unprepare(fimc->clock);
         clk_put(fimc->clock);
-       fimc->clock = NULL;
+       fimc->clock = ERR_PTR(-EINVAL);
  }

  static int fimc_lite_clk_get(struct fimc_lite *fimc)
@@ -1436,7 +1436,7 @@  static int fimc_lite_clk_get(struct fimc_lite *fimc)
         ret = clk_prepare(fimc->clock);
         if (ret < 0) {
                 clk_put(fimc->clock);
-               fimc->clock = NULL;
+               fimc->clock = ERR_PTR(-EINVAL);
         }
         return ret;
  }