summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2017-06-11 17:52:20 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-06-13 16:03:22 +0200
commitcbbdc6082917a92da0fc07cee255111de16ed64a (patch)
tree328f4046a299002f3ac5cb98747c0653ea9a4677
parentc845736dbcd26619acc136b588bcd2f48b1fda45 (diff)
downloadlinux-cbbdc6082917a92da0fc07cee255111de16ed64a.tar.gz
linux-cbbdc6082917a92da0fc07cee255111de16ed64a.tar.bz2
linux-cbbdc6082917a92da0fc07cee255111de16ed64a.zip
misc: apds990x: Use sysfs_match_string() helper
Use sysfs_match_string() helper instead of open coded variant. Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/misc/apds990x.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/misc/apds990x.c b/drivers/misc/apds990x.c
index c341164edaad..84e5b949399e 100644
--- a/drivers/misc/apds990x.c
+++ b/drivers/misc/apds990x.c
@@ -841,7 +841,7 @@ static ssize_t apds990x_prox_enable_store(struct device *dev,
static DEVICE_ATTR(prox0_raw_en, S_IRUGO | S_IWUSR, apds990x_prox_enable_show,
apds990x_prox_enable_store);
-static const char reporting_modes[][9] = {"trigger", "periodic"};
+static const char *reporting_modes[] = {"trigger", "periodic"};
static ssize_t apds990x_prox_reporting_mode_show(struct device *dev,
struct device_attribute *attr, char *buf)
@@ -856,13 +856,13 @@ static ssize_t apds990x_prox_reporting_mode_store(struct device *dev,
const char *buf, size_t len)
{
struct apds990x_chip *chip = dev_get_drvdata(dev);
+ int ret;
- if (sysfs_streq(buf, reporting_modes[0]))
- chip->prox_continuous_mode = 0;
- else if (sysfs_streq(buf, reporting_modes[1]))
- chip->prox_continuous_mode = 1;
- else
- return -EINVAL;
+ ret = sysfs_match_string(reporting_modes, buf);
+ if (ret < 0)
+ return ret;
+
+ chip->prox_continuous_mode = ret;
return len;
}