From patchwork Wed Jul 19 07:43:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Schulz X-Patchwork-Id: 9850657 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9534460392 for ; Wed, 19 Jul 2017 07:44:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 82117285FD for ; Wed, 19 Jul 2017 07:44:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 76C5028608; Wed, 19 Jul 2017 07:44:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8BDD285FD for ; Wed, 19 Jul 2017 07:44:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751683AbdGSHoD (ORCPT ); Wed, 19 Jul 2017 03:44:03 -0400 Received: from mail.free-electrons.com ([62.4.15.54]:54396 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752315AbdGSHoC (ORCPT ); Wed, 19 Jul 2017 03:44:02 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id D360E207FE; Wed, 19 Jul 2017 09:43:58 +0200 (CEST) Received: from localhost.localdomain (LStLambert-657-1-97-87.w90-63.abo.wanadoo.fr [90.63.216.87]) by mail.free-electrons.com (Postfix) with ESMTPSA id 929A32082D; Wed, 19 Jul 2017 09:43:48 +0200 (CEST) From: Quentin Schulz To: dmitry.torokhov@gmail.com, wens@csie.org, lee.jones@linaro.org Cc: Quentin Schulz , hdegoede@redhat.com, linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, thomas.petazzoni@free-electrons.com, maxime.ripard@free-electrons.com Subject: [PATCH v2 2/3] Input: axp20x-pek: remove mention to extended attributes Date: Wed, 19 Jul 2017 09:43:36 +0200 Message-Id: <20170719074337.19189-3-quentin.schulz@free-electrons.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170719074337.19189-1-quentin.schulz@free-electrons.com> References: <20170719074337.19189-1-quentin.schulz@free-electrons.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that extended attributes aren't used anymore, remove all the mentions to extended attributes. Signed-off-by: Quentin Schulz Reviewed-by: Chen-Yu Tsai --- drivers/input/misc/axp20x-pek.c | 60 ++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/drivers/input/misc/axp20x-pek.c b/drivers/input/misc/axp20x-pek.c index 94c89fbeeeaa..fa49f45c0f0e 100644 --- a/drivers/input/misc/axp20x-pek.c +++ b/drivers/input/misc/axp20x-pek.c @@ -70,9 +70,9 @@ static const struct axp20x_info axp20x_info = { .shutdown_mask = AXP20X_PEK_SHUTDOWN_MASK, }; -static ssize_t axp20x_show_ext_attr(struct device *dev, - const struct axp20x_time *time, - unsigned int mask, char *buf) +static ssize_t axp20x_show_attr(struct device *dev, + const struct axp20x_time *time, + unsigned int mask, char *buf) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); unsigned int val; @@ -92,30 +92,30 @@ static ssize_t axp20x_show_ext_attr(struct device *dev, return sprintf(buf, "%u\n", val); } -static ssize_t axp20x_show_ext_attr_startup(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t axp20x_show_attr_startup(struct device *dev, + struct device_attribute *attr, + char *buf) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); - return axp20x_show_ext_attr(dev, axp20x_pek->info->startup_time, - axp20x_pek->info->startup_mask, buf); + return axp20x_show_attr(dev, axp20x_pek->info->startup_time, + axp20x_pek->info->startup_mask, buf); } -static ssize_t axp20x_show_ext_attr_shutdown(struct device *dev, - struct device_attribute *attr, - char *buf) +static ssize_t axp20x_show_attr_shutdown(struct device *dev, + struct device_attribute *attr, + char *buf) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); - return axp20x_show_ext_attr(dev, axp20x_pek->info->shutdown_time, - axp20x_pek->info->shutdown_mask, buf); + return axp20x_show_attr(dev, axp20x_pek->info->shutdown_time, + axp20x_pek->info->shutdown_mask, buf); } -static ssize_t axp20x_store_ext_attr(struct device *dev, - const struct axp20x_time *time, - unsigned int mask, const char *buf, - size_t count) +static ssize_t axp20x_store_attr(struct device *dev, + const struct axp20x_time *time, + unsigned int mask, const char *buf, + size_t count) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); char val_str[20]; @@ -157,30 +157,28 @@ static ssize_t axp20x_store_ext_attr(struct device *dev, return count; } -static ssize_t axp20x_store_ext_attr_startup(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t axp20x_store_attr_startup(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); - return axp20x_store_ext_attr(dev, axp20x_pek->info->startup_time, - axp20x_pek->info->startup_mask, buf, - count); + return axp20x_store_attr(dev, axp20x_pek->info->startup_time, + axp20x_pek->info->startup_mask, buf, count); } -static ssize_t axp20x_store_ext_attr_shutdown(struct device *dev, - struct device_attribute *attr, - const char *buf, size_t count) +static ssize_t axp20x_store_attr_shutdown(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) { struct axp20x_pek *axp20x_pek = dev_get_drvdata(dev); - return axp20x_store_ext_attr(dev, axp20x_pek->info->shutdown_time, - axp20x_pek->info->shutdown_mask, buf, - count); + return axp20x_store_attr(dev, axp20x_pek->info->shutdown_time, + axp20x_pek->info->shutdown_mask, buf, count); } -DEVICE_ATTR(startup, 0644, axp20x_show_ext_attr_startup, axp20x_store_ext_attr_startup); -DEVICE_ATTR(shutdown, 0644, axp20x_show_ext_attr_shutdown, axp20x_store_ext_attr_shutdown); +DEVICE_ATTR(startup, 0644, axp20x_show_attr_startup, axp20x_store_attr_startup); +DEVICE_ATTR(shutdown, 0644, axp20x_show_attr_shutdown, axp20x_store_attr_shutdown); static struct attribute *axp20x_attributes[] = { &dev_attr_startup.attr,