* [PATCH 1/1] [media] exynos4-is: Remove redundant NULL check in fimc-lite.c
@ 2013-04-30 4:51 Sachin Kamat
2013-05-01 9:29 ` Sylwester Nawrocki
0 siblings, 1 reply; 3+ messages in thread
From: Sachin Kamat @ 2013-04-30 4:51 UTC (permalink / raw)
To: linux-media; +Cc: s.nawrocki, sachin.kamat, patches
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);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] [media] exynos4-is: Remove redundant NULL check in fimc-lite.c
2013-04-30 4:51 [PATCH 1/1] [media] exynos4-is: Remove redundant NULL check in fimc-lite.c Sachin Kamat
@ 2013-05-01 9:29 ` Sylwester Nawrocki
2013-05-02 4:19 ` Sachin Kamat
0 siblings, 1 reply; 3+ messages in thread
From: Sylwester Nawrocki @ 2013-05-01 9:29 UTC (permalink / raw)
To: Sachin Kamat; +Cc: linux-media, s.nawrocki, patches
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:
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;
}
Thanks.
Sylwester
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/1] [media] exynos4-is: Remove redundant NULL check in fimc-lite.c
2013-05-01 9:29 ` Sylwester Nawrocki
@ 2013-05-02 4:19 ` Sachin Kamat
0 siblings, 0 replies; 3+ messages in thread
From: Sachin Kamat @ 2013-05-02 4:19 UTC (permalink / raw)
To: Sylwester Nawrocki; +Cc: linux-media, s.nawrocki, patches
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.
--
With warm regards,
Sachin
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-05-02 4:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-30 4:51 [PATCH 1/1] [media] exynos4-is: Remove redundant NULL check in fimc-lite.c Sachin Kamat
2013-05-01 9:29 ` Sylwester Nawrocki
2013-05-02 4:19 ` Sachin Kamat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox