lkml.org 
[lkml]   [2015]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 2/2] rtc: change "client->irq >= 0" to "client->irq > 0"
Hi,

On 03/06/2015 at 00:34:13 +0300, Octavian Purdila wrote :
> Since commit dab472eb931b ("i2c / ACPI: Use 0 to indicate that device

You can't reference that commit ID as Linus Torvalds didn't pull that
patch yet.

I'd also prefer a more descriptive subject line.

> does not have interrupt assigned"), 0 is not a valid i2c client irq
> anymore, so change all driver's checks accordingly.
>
> Signed-off-by: Octavian Purdila <octavian.purdila@intel.com>
> ---
> drivers/rtc/rtc-ds1374.c | 4 ++--
> drivers/rtc/rtc-ds3232.c | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c
> index 167783f..592458c 100644
> --- a/drivers/rtc/rtc-ds1374.c
> +++ b/drivers/rtc/rtc-ds1374.c
> @@ -689,7 +689,7 @@ static int ds1374_suspend(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
>
> - if (client->irq >= 0 && device_may_wakeup(&client->dev))
> + if (client->irq > 0 && device_may_wakeup(&client->dev))
> enable_irq_wake(client->irq);
> return 0;
> }
> @@ -698,7 +698,7 @@ static int ds1374_resume(struct device *dev)
> {
> struct i2c_client *client = to_i2c_client(dev);
>
> - if (client->irq >= 0 && device_may_wakeup(&client->dev))
> + if (client->irq > 0 && device_may_wakeup(&client->dev))
> disable_irq_wake(client->irq);
> return 0;
> }
> diff --git a/drivers/rtc/rtc-ds3232.c b/drivers/rtc/rtc-ds3232.c
> index 7e48e53..f280dd1 100644
> --- a/drivers/rtc/rtc-ds3232.c
> +++ b/drivers/rtc/rtc-ds3232.c
> @@ -443,7 +443,7 @@ static int ds3232_remove(struct i2c_client *client)
> {
> struct ds3232 *ds3232 = i2c_get_clientdata(client);
>
> - if (client->irq >= 0) {
> + if (client->irq > 0) {
> mutex_lock(&ds3232->mutex);
> ds3232->exiting = 1;
> mutex_unlock(&ds3232->mutex);
> --
> 1.9.1
>

--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com


\
 
 \ /
  Last update: 2015-06-03 01:21    [W:0.088 / U:0.036 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site