* [PATCH v2] power: supply: twl4030_charger: Use sysfs_match_string() helper
@ 2017-06-11 15:15 Andy Shevchenko
2017-06-14 20:11 ` Sebastian Reichel
0 siblings, 1 reply; 2+ messages in thread
From: Andy Shevchenko @ 2017-06-11 15:15 UTC (permalink / raw)
To: linux-pm; +Cc: Andy Shevchenko, Sebastian Reichel
Use sysfs_match_string() helper instead of open coded variant.
Cc: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
- constify array of mode names
drivers/power/supply/twl4030_charger.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
index 785a07bc4f39..07c70e59f31a 100644
--- a/drivers/power/supply/twl4030_charger.c
+++ b/drivers/power/supply/twl4030_charger.c
@@ -153,7 +153,7 @@ struct twl4030_bci {
};
/* strings for 'usb_mode' values */
-static char *modes[] = { "off", "auto", "continuous" };
+static const char *modes[] = { "off", "auto", "continuous" };
/*
* clear and set bits on an given register on a given module
@@ -669,14 +669,10 @@ twl4030_bci_mode_store(struct device *dev, struct device_attribute *attr,
int mode;
int status;
- if (sysfs_streq(buf, modes[0]))
- mode = 0;
- else if (sysfs_streq(buf, modes[1]))
- mode = 1;
- else if (sysfs_streq(buf, modes[2]))
- mode = 2;
- else
- return -EINVAL;
+ mode = sysfs_match_string(modes, buf);
+ if (mode < 0)
+ return mode;
+
if (dev == &bci->ac->dev) {
if (mode == 2)
return -EINVAL;
--
2.11.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] power: supply: twl4030_charger: Use sysfs_match_string() helper
2017-06-11 15:15 [PATCH v2] power: supply: twl4030_charger: Use sysfs_match_string() helper Andy Shevchenko
@ 2017-06-14 20:11 ` Sebastian Reichel
0 siblings, 0 replies; 2+ messages in thread
From: Sebastian Reichel @ 2017-06-14 20:11 UTC (permalink / raw)
To: Andy Shevchenko; +Cc: linux-pm
[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]
Hi,
On Sun, Jun 11, 2017 at 06:15:48PM +0300, Andy Shevchenko wrote:
> Use sysfs_match_string() helper instead of open coded variant.
>
> Cc: Sebastian Reichel <sre@kernel.org>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Thanks, queued.
-- Sebastian
> ---
> - constify array of mode names
> drivers/power/supply/twl4030_charger.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/power/supply/twl4030_charger.c b/drivers/power/supply/twl4030_charger.c
> index 785a07bc4f39..07c70e59f31a 100644
> --- a/drivers/power/supply/twl4030_charger.c
> +++ b/drivers/power/supply/twl4030_charger.c
> @@ -153,7 +153,7 @@ struct twl4030_bci {
> };
>
> /* strings for 'usb_mode' values */
> -static char *modes[] = { "off", "auto", "continuous" };
> +static const char *modes[] = { "off", "auto", "continuous" };
>
> /*
> * clear and set bits on an given register on a given module
> @@ -669,14 +669,10 @@ twl4030_bci_mode_store(struct device *dev, struct device_attribute *attr,
> int mode;
> int status;
>
> - if (sysfs_streq(buf, modes[0]))
> - mode = 0;
> - else if (sysfs_streq(buf, modes[1]))
> - mode = 1;
> - else if (sysfs_streq(buf, modes[2]))
> - mode = 2;
> - else
> - return -EINVAL;
> + mode = sysfs_match_string(modes, buf);
> + if (mode < 0)
> + return mode;
> +
> if (dev == &bci->ac->dev) {
> if (mode == 2)
> return -EINVAL;
> --
> 2.11.0
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-14 20:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-11 15:15 [PATCH v2] power: supply: twl4030_charger: Use sysfs_match_string() helper Andy Shevchenko
2017-06-14 20:11 ` Sebastian Reichel
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).