From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751989AbdFKOw3 (ORCPT ); Sun, 11 Jun 2017 10:52:29 -0400 Received: from mga14.intel.com ([192.55.52.115]:41532 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751764AbdFKOw2 (ORCPT ); Sun, 11 Jun 2017 10:52:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,329,1493708400"; d="scan'208";a="1159150801" From: Andy Shevchenko To: linux-kernel@vger.kernel.org, Geert Uytterhoeven Cc: Andy Shevchenko , Arnd Bergmann , Greg Kroah-Hartman Subject: [PATCH v2] misc: apds990x: Use sysfs_match_string() helper Date: Sun, 11 Jun 2017 17:52:20 +0300 Message-Id: <20170611145220.38897-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.11.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use sysfs_match_string() helper instead of open coded variant. Cc: Arnd Bergmann Cc: Greg Kroah-Hartman Signed-off-by: Andy Shevchenko --- - convert array of 9 bytes to array of pointers (Geert) drivers/misc/apds990x.c | 14 +++++++------- 1 file 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; } -- 2.11.0