Skip to contentSkip to conversation

misc: apds990x: Use sysfs_match_string() helper

PATCH New Andy Shevchenko 1 participant 1 message Jun 11, 2017 Char and misc drivers

lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH v2 1/1 misc: apds990x: Use sysfs_match_string() helper

Use sysfs_match_string() helper instead of open coded variant.

Cc Arnd Bergmann <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Signed-off-by Andy Shevchenko <[email protected]>

---
- convert array of 9 bytes to array of pointers (Geert)

 drivers/misc/apds990x.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/misc/apds990x.c +7 -7
index c341164edaad..84e5b949399e 100644
@@ -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;
 }
Signature · 1 line
2.11.0