From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17533C4361B for ; Wed, 16 Dec 2020 01:40:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E36252311E for ; Wed, 16 Dec 2020 01:40:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725769AbgLPBkH (ORCPT ); Tue, 15 Dec 2020 20:40:07 -0500 Received: from mail2.protonmail.ch ([185.70.40.22]:45261 "EHLO mail2.protonmail.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725550AbgLPBkH (ORCPT ); Tue, 15 Dec 2020 20:40:07 -0500 Date: Wed, 16 Dec 2020 01:39:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1608082764; bh=lPtPo6QjPZZAvGFPghv331j8n043gBexnNerXfAmyPY=; h=Date:To:From:Reply-To:Subject:In-Reply-To:References:From; b=KJ+yTBG8Iu6c8qCbLcCA8ijD6ecSYdTkKgw9Z2+/oVq4Sr1qtYluelD88uJ7uq9RT B5qO1q7mjDzcB7jWZbqWu63tizavOnNm/cPkgrgT6RNUefG1y+H74xzd8Kwx9u4sCc w2y183j6VZJIj93bqKecLoq3+sVhhmkDhrzoIx6U= To: platform-driver-x86@vger.kernel.org, Hans de Goede , Mark Gross , Ike Panhc From: =?utf-8?Q?Barnab=C3=A1s_P=C5=91cze?= Reply-To: =?utf-8?Q?Barnab=C3=A1s_P=C5=91cze?= Subject: [PATCH 04/24] platform/x86: ideapad-laptop: use sysfs_emit() Message-ID: <20201216013857.360987-5-pobrn@protonmail.com> In-Reply-To: <20201216013857.360987-1-pobrn@protonmail.com> References: <20201216013857.360987-1-pobrn@protonmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org sysfs_emit() has been introduced to make it less ambiguous which function is preferred when writing to the output buffer in a device attribute's show() callback. Convert the ideapad-laptop module to utilize this new helper function. Signed-off-by: Barnab=C3=A1s P=C5=91cze diff --git a/drivers/platform/x86/ideapad-laptop.c b/drivers/platform/x86/i= deapad-laptop.c index aefe83996be6..11df791d702c 100644 --- a/drivers/platform/x86/ideapad-laptop.c +++ b/drivers/platform/x86/ideapad-laptop.c @@ -24,6 +24,7 @@ #include #include #include +#include #include =20 #define IDEAPAD_RFKILL_DEV_NUM=09(3) @@ -344,8 +345,8 @@ static ssize_t show_ideapad_cam(struct device *dev, =09struct ideapad_private *priv =3D dev_get_drvdata(dev); =20 =09if (read_ec_data(priv->adev->handle, VPCCMD_R_CAMERA, &result)) -=09=09return sprintf(buf, "-1\n"); -=09return sprintf(buf, "%lu\n", result); +=09=09return sysfs_emit(buf, "-1\n"); +=09return sysfs_emit(buf, "%lu\n", result); } =20 static ssize_t store_ideapad_cam(struct device *dev, @@ -375,8 +376,8 @@ static ssize_t show_ideapad_fan(struct device *dev, =09struct ideapad_private *priv =3D dev_get_drvdata(dev); =20 =09if (read_ec_data(priv->adev->handle, VPCCMD_R_FAN, &result)) -=09=09return sprintf(buf, "-1\n"); -=09return sprintf(buf, "%lu\n", result); +=09=09return sysfs_emit(buf, "-1\n"); +=09return sysfs_emit(buf, "%lu\n", result); } =20 static ssize_t store_ideapad_fan(struct device *dev, @@ -408,8 +409,8 @@ static ssize_t touchpad_show(struct device *dev, =09unsigned long result; =20 =09if (read_ec_data(priv->adev->handle, VPCCMD_R_TOUCHPAD, &result)) -=09=09return sprintf(buf, "-1\n"); -=09return sprintf(buf, "%lu\n", result); +=09=09return sysfs_emit(buf, "-1\n"); +=09return sysfs_emit(buf, "%lu\n", result); } =20 /* Switch to RO for now: It might be revisited in the future */ @@ -441,8 +442,8 @@ static ssize_t conservation_mode_show(struct device *de= v, =09unsigned long result; =20 =09if (method_gbmd(priv->adev->handle, &result)) -=09=09return sprintf(buf, "-1\n"); -=09return sprintf(buf, "%u\n", test_bit(BM_CONSERVATION_BIT, &result)); +=09=09return sysfs_emit(buf, "-1\n"); +=09return sysfs_emit(buf, "%u\n", test_bit(BM_CONSERVATION_BIT, &result)); } =20 static ssize_t conservation_mode_store(struct device *dev, @@ -477,10 +478,10 @@ static ssize_t fn_lock_show(struct device *dev, =09int fail =3D read_method_int(priv->adev->handle, "HALS", &hals); =20 =09if (fail) -=09=09return sprintf(buf, "-1\n"); +=09=09return sysfs_emit(buf, "-1\n"); =20 =09result =3D hals; -=09return sprintf(buf, "%u\n", test_bit(HA_FNLOCK_BIT, &result)); +=09return sysfs_emit(buf, "%u\n", test_bit(HA_FNLOCK_BIT, &result)); } =20 static ssize_t fn_lock_store(struct device *dev, --=20 2.29.2