From patchwork Wed Apr 21 20:16:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 425461 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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT 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 597E3C433B4 for ; Wed, 21 Apr 2021 20:16:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30B2361354 for ; Wed, 21 Apr 2021 20:16:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235643AbhDUURR (ORCPT ); Wed, 21 Apr 2021 16:17:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235370AbhDUURR (ORCPT ); Wed, 21 Apr 2021 16:17:17 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDF9FC06174A for ; Wed, 21 Apr 2021 13:16:43 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id u17so65383918ejk.2 for ; Wed, 21 Apr 2021 13:16:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rasmusvillemoes.dk; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ivDrmLJQ78MRoNxDq6lpDH6wyRibjzDPlh4Bfq0I76g=; b=aZNQaP9Nt8mcyewR1rhQdrQsUpCmDSag+YgDnubsGHHFQBM4/YFVPI6bFVgVGn8TBS QM53rSV14uzrOPWWWNkncUX7QiiKC1Lj4+ZGwZpJxrZ/cdi8dX//yUdmZIiK1ZN497t9 yXqcul3Q1SIiyro2nVViotBK+X4EOeSGOfKWk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ivDrmLJQ78MRoNxDq6lpDH6wyRibjzDPlh4Bfq0I76g=; b=bkZBwFGc8pw51q7n0svRym86HzjIcAaC97x9F8hAZ077pRIE7ABaSesv8yWUbmIcZ7 DLG7wEDSayjbUdgH4J16LCYCAMz68iMLtfexUrXy/yURbZZcGAdN/wW8hOzwrRiNgrN/ Wtm2lKXtgTHWKt78YbuH/ZGYicD8URYrBZtk49XO7T7tFqjLA5FuH34tvBijyJLDNmYJ X5X+Vd91YxFfxoeV04GKHjsXqkuilOzUn3g0uGYEg1BZVx6gFRcEMAnc/5pf0GQS9ndQ /nNng+ovQ+CcLPVt2wtYVG9j+N0yU1S4oyaylLLhAL+B2xFsbdMC0+fvEAKEjx5GPucl inKg== X-Gm-Message-State: AOAM533rJK3h8JmII5c9BT71X5eL3hWIhKLEzoZdb/DgB14AL2puEPPM YY5WZ8xVWLjsVl9BYBt5l3frPQ== X-Google-Smtp-Source: ABdhPJzttZUmAioz/rDZIfVjdKdCfclwYa/Lkfbgwz6n9uxqccMtaO6hxzGpMyecZ3o1yZBPtAHz6A== X-Received: by 2002:a17:906:aecd:: with SMTP id me13mr34886896ejb.324.1619036202576; Wed, 21 Apr 2021 13:16:42 -0700 (PDT) Received: from prevas-ravi.prevas.se ([80.208.71.248]) by smtp.gmail.com with ESMTPSA id u19sm348825edy.23.2021.04.21.13.16.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Apr 2021 13:16:42 -0700 (PDT) From: Rasmus Villemoes To: Dmitry Torokhov Cc: Rasmus Villemoes , linux-input@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] Input: atkbd - simplify atkbd_show_force_release() Date: Wed, 21 Apr 2021 22:16:39 +0200 Message-Id: <20210421201639.1541945-1-linux@rasmusvillemoes.dk> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org We can just include the newline in the format string, and scnprintf() guarantees nul-termination. These days, sysfs_emit() is preferred in sysfs ->show methods, so switch to that. Signed-off-by: Rasmus Villemoes --- drivers/input/keyboard/atkbd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c index edc613efc158..b146a3ec631a 100644 --- a/drivers/input/keyboard/atkbd.c +++ b/drivers/input/keyboard/atkbd.c @@ -1492,13 +1492,8 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun static ssize_t atkbd_show_force_release(struct atkbd *atkbd, char *buf) { - size_t len = scnprintf(buf, PAGE_SIZE - 1, "%*pbl", - ATKBD_KEYMAP_SIZE, atkbd->force_release_mask); - - buf[len++] = '\n'; - buf[len] = '\0'; - - return len; + return sysfs_emit(buf, "%*pbl\n", + ATKBD_KEYMAP_SIZE, atkbd->force_release_mask); } static ssize_t atkbd_set_force_release(struct atkbd *atkbd,