* [PATCH] i2c: remove unnecessary 'else' after 'return' statement
@ 2014-08-06 7:06 Kiran Padwal
[not found] ` <1407308765-13869-1-git-send-email-kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>
0 siblings, 1 reply; 2+ messages in thread
From: Kiran Padwal @ 2014-08-06 7:06 UTC (permalink / raw)
To: wsa; +Cc: kiran.padwal, linux-i2c, linux-kernel
Fix the following warning reported by checkpatch.pl:
WARNING: else is not generally useful after a break or return
Signed-off-by: Kiran Padwal <kiran.padwal@smartplayin.com>
---
drivers/i2c/i2c-core.c | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 632057a..228bd04 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -351,8 +351,8 @@ static int i2c_device_pm_suspend(struct device *dev)
if (pm)
return pm_generic_suspend(dev);
- else
- return i2c_legacy_suspend(dev, PMSG_SUSPEND);
+
+ return i2c_legacy_suspend(dev, PMSG_SUSPEND);
}
static int i2c_device_pm_resume(struct device *dev)
@@ -361,8 +361,8 @@ static int i2c_device_pm_resume(struct device *dev)
if (pm)
return pm_generic_resume(dev);
- else
- return i2c_legacy_resume(dev);
+
+ return i2c_legacy_resume(dev);
}
static int i2c_device_pm_freeze(struct device *dev)
@@ -371,8 +371,8 @@ static int i2c_device_pm_freeze(struct device *dev)
if (pm)
return pm_generic_freeze(dev);
- else
- return i2c_legacy_suspend(dev, PMSG_FREEZE);
+
+ return i2c_legacy_suspend(dev, PMSG_FREEZE);
}
static int i2c_device_pm_thaw(struct device *dev)
@@ -381,8 +381,8 @@ static int i2c_device_pm_thaw(struct device *dev)
if (pm)
return pm_generic_thaw(dev);
- else
- return i2c_legacy_resume(dev);
+
+ return i2c_legacy_resume(dev);
}
static int i2c_device_pm_poweroff(struct device *dev)
@@ -391,8 +391,8 @@ static int i2c_device_pm_poweroff(struct device *dev)
if (pm)
return pm_generic_poweroff(dev);
- else
- return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
+
+ return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
}
static int i2c_device_pm_restore(struct device *dev)
@@ -401,8 +401,8 @@ static int i2c_device_pm_restore(struct device *dev)
if (pm)
return pm_generic_restore(dev);
- else
- return i2c_legacy_resume(dev);
+
+ return i2c_legacy_resume(dev);
}
#else /* !CONFIG_PM_SLEEP */
#define i2c_device_pm_suspend NULL
@@ -622,8 +622,8 @@ static int i2c_trylock_adapter(struct i2c_adapter *adapter)
if (parent)
return i2c_trylock_adapter(parent);
- else
- return rt_mutex_trylock(&adapter->bus_lock);
+
+ return rt_mutex_trylock(&adapter->bus_lock);
}
/**
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] i2c: remove unnecessary 'else' after 'return' statement
[not found] ` <1407308765-13869-1-git-send-email-kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>
@ 2014-08-06 18:55 ` Wolfram Sang
0 siblings, 0 replies; 2+ messages in thread
From: Wolfram Sang @ 2014-08-06 18:55 UTC (permalink / raw)
To: Kiran Padwal
Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 2795 bytes --]
On Wed, Aug 06, 2014 at 12:36:05PM +0530, Kiran Padwal wrote:
> Fix the following warning reported by checkpatch.pl:
>
> WARNING: else is not generally useful after a break or return
>
> Signed-off-by: Kiran Padwal <kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>
Technically true, yet I think the original code is a tad more readable,
so I'll keep it like it is.
> ---
> drivers/i2c/i2c-core.c | 28 ++++++++++++++--------------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index 632057a..228bd04 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -351,8 +351,8 @@ static int i2c_device_pm_suspend(struct device *dev)
>
> if (pm)
> return pm_generic_suspend(dev);
> - else
> - return i2c_legacy_suspend(dev, PMSG_SUSPEND);
> +
> + return i2c_legacy_suspend(dev, PMSG_SUSPEND);
> }
>
> static int i2c_device_pm_resume(struct device *dev)
> @@ -361,8 +361,8 @@ static int i2c_device_pm_resume(struct device *dev)
>
> if (pm)
> return pm_generic_resume(dev);
> - else
> - return i2c_legacy_resume(dev);
> +
> + return i2c_legacy_resume(dev);
> }
>
> static int i2c_device_pm_freeze(struct device *dev)
> @@ -371,8 +371,8 @@ static int i2c_device_pm_freeze(struct device *dev)
>
> if (pm)
> return pm_generic_freeze(dev);
> - else
> - return i2c_legacy_suspend(dev, PMSG_FREEZE);
> +
> + return i2c_legacy_suspend(dev, PMSG_FREEZE);
> }
>
> static int i2c_device_pm_thaw(struct device *dev)
> @@ -381,8 +381,8 @@ static int i2c_device_pm_thaw(struct device *dev)
>
> if (pm)
> return pm_generic_thaw(dev);
> - else
> - return i2c_legacy_resume(dev);
> +
> + return i2c_legacy_resume(dev);
> }
>
> static int i2c_device_pm_poweroff(struct device *dev)
> @@ -391,8 +391,8 @@ static int i2c_device_pm_poweroff(struct device *dev)
>
> if (pm)
> return pm_generic_poweroff(dev);
> - else
> - return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
> +
> + return i2c_legacy_suspend(dev, PMSG_HIBERNATE);
> }
>
> static int i2c_device_pm_restore(struct device *dev)
> @@ -401,8 +401,8 @@ static int i2c_device_pm_restore(struct device *dev)
>
> if (pm)
> return pm_generic_restore(dev);
> - else
> - return i2c_legacy_resume(dev);
> +
> + return i2c_legacy_resume(dev);
> }
> #else /* !CONFIG_PM_SLEEP */
> #define i2c_device_pm_suspend NULL
> @@ -622,8 +622,8 @@ static int i2c_trylock_adapter(struct i2c_adapter *adapter)
>
> if (parent)
> return i2c_trylock_adapter(parent);
> - else
> - return rt_mutex_trylock(&adapter->bus_lock);
> +
> + return rt_mutex_trylock(&adapter->bus_lock);
> }
>
> /**
> --
> 1.7.9.5
>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-06 18:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-06 7:06 [PATCH] i2c: remove unnecessary 'else' after 'return' statement Kiran Padwal
[not found] ` <1407308765-13869-1-git-send-email-kiran.padwal-edOiRQu9Xnj5XLMNweQjbQ@public.gmane.org>
2014-08-06 18:55 ` Wolfram Sang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).