From patchwork Sun Jul 30 20:37:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 128284 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1662413vqg; Sun, 30 Jul 2023 14:04:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlGBxg6tpQt0a/Gr9ujC3eUo/elKQX1+bF01/kuUpBWkvdkmNIIzWvNxuK6foR80jZSO4U9U X-Received: by 2002:a17:906:59:b0:99b:d435:e994 with SMTP id 25-20020a170906005900b0099bd435e994mr5745953ejg.32.1690751085953; Sun, 30 Jul 2023 14:04:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690751085; cv=none; d=google.com; s=arc-20160816; b=XWqq2yjpBChpEkj3lXFPLLucq0UrsdE9Y6OdmgE5zqzaEffDU/UsRtHyPCgFazOQ7z xhhyKUL6bEidSwaAPia1f0E760/j9hugDGAkHLSXItiVSw8D+pOTC8kGWNu7jLSWd0HY q1k5Pfw4ne93zBtzFNFUhce6rDqMB8s3QQv0u17gbiK4OXRflcM1onhGvqyZ7AGcR10G umoZedODzJIb2wWpmDnBRmwxGuU4msaXnO5bmFHmlSx+YeWkaW1XsYuSpZr/BGwHRDjE Jt6XqJcH8kRwPsKF1rZydVVk8JvlQ+LJyOzIFSG88BeM5u/Uw5Bqa3ixL9el5DI8l+Sx l64A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:ui-outboundreport:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=DjF4k3Loqnbwvc+n35jjHInTccG0HA1aG32PwydUs6U=; fh=e8SeHVBV39LDceUoMP3i4hF2US4qLv4cVQmQlOAT1Y4=; b=Mm+2TSPLNIOZPQromtPRUtRxmb1cKuhNhK9WyNZYeI2h3JZkEjMy6YGTpqvrJkkZAt Sp7BTR3jSIMTBEMg5MVwk0TlnbDaHXTY+dtFqZrKNdy7/u+iWXAY3gJo9+cb03wSjitz ZlEGoMHznLn/oCIDiF2y2MYPBKuhcUYFml7zsitttBtSxkjbR6Q3rT2HXknOwHXDtz2s cqg8NyhjXCb9hZB0VjVtHtQR1zQ4DxRB8TdyjKicOYJuSUCqAg39h+/HKBtzFH+gCbX7 5TFAD6h10ql+k8qe0v0lOgAzfOtjRIJIsIkmIU2/X5fWfpiy04mriob9+lvJyvRDyyMP jKpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=qChqEIyp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmx.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ha11-20020a170906a88b00b0098e38b3b7e3si6028309ejb.793.2023.07.30.14.04.22; Sun, 30 Jul 2023 14:04:45 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=qChqEIyp; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gmx.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjG3Uho (ORCPT + 99 others); Sun, 30 Jul 2023 16:37:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229899AbjG3Uhl (ORCPT ); Sun, 30 Jul 2023 16:37:41 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.15.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A6940E78; Sun, 30 Jul 2023 13:37:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690749450; x=1691354250; i=w_armin@gmx.de; bh=OHiBItOOoRVvdzRbZEFrTfef1epBD6WyUoDTx7C3Ghk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=qChqEIyp5BPwswbnVVqJZUGwXcTJ8qjTlBl/bmSZfvh26bQpZO6c4y63MDgLmGSJplMxd+U xFJIHXoZp6aXlR5QXk2unyPIyncDsYgIi7NVp+SJW4IP1KKQenL1uj/nKtQOODiJXyYeojy7U MW9D/MSNLs2WogU1ADAdJWv5gohRxuwRaXQcJdCDLJxg3nXYGFm2vIS9ua7QWV1kuU3oYmz/d WumCO+qpJ3E4rtUPHxbcwxMlr/HVr4AsNd9OuKjeRdNKHawcV4yPttbrdO3NQPmGq/lXzV2Do 3orwm0ZJYrk3ca9mu9LuRUKZ7kICwB7IK1n7FX/xYTwQDJc4jLkg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from mx-amd-b650.users.agdsn.de ([141.30.226.129]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1McYCl-1psFSZ1JDZ-00cxed; Sun, 30 Jul 2023 22:37:30 +0200 From: Armin Wolf To: hdegoede@redhat.com, markgross@kernel.org, thomas@t-8ch.de Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] platform/x86: wmi-bmof: Simplify read_bmof() Date: Sun, 30 Jul 2023 22:37:22 +0200 Message-Id: <20230730203723.8882-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230730203723.8882-1-W_Armin@gmx.de> References: <20230730203723.8882-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:+jEY729e0a0EDFLX/WhlWcj1P0nEjB3vk7ox0uUuhU111ghutn1 106dAHOv+az6LaTIWKTAgjb/Ib31fmCvb0YJz0UxLI+d/sZq3fIEaKQ9TKUtFf3vSIlxwB/ iGwKrlV+zLXdgrgqqmtX4WF0+PmFJyXlyuA/x7NTx3e6lfwWXzdVquPEYRmY1ZdseQDJiyN ikVJ4oYQ6Vpd7trEuZDgQ== UI-OutboundReport: notjunk:1;M01:P0:JuG2dx9mxfY=;KHB0ZeQJ2kTc7/U0mYkH1F6AFA5 Edm45XN0TAdkrmHEA3asaX0TCBvTc3tG4Z5FTxaQZqJ86u310FuE+05tRdZHReYi7QvKqt3Fd tjbGfIMPLdraKBnPXKch97A7CkhxBTAsB9K113sjAYnJlRcBa1If4I6Luvn3chrrtIw/imuPT 4Fou2IpziAcwPVWz6jNsopqfAN6Otje4wjzqIU/d0nrpg75m7hDXQHhhphdVkznnl3hgy5SPC k+JEmU5eEqYk9e5En1svTVmzmGarB9Ws0lc5OV5yDfSXwZWXLQKfTXsknQqFjDup7MDTx6c7O bqTBbCDF9au7DCl1NaDX4KH2IMs9sGLXgsOPcVFcshxdY0k9HOqXfUa6lEB04zuskc6YcsIWY MLj1OvPQTaui9MOaOonhhZL7AmM39ja5yrNhkmg46RP8GkHu/w3f25Y7Rsj6XlCOe5uBGtUXy leXnlraynTiqHnJoZi8hbZUMYG02oI09KDX81gzvcbcG2JSwNOwWj8KegfPXMpXCYj0/S8rCp 8pI6kcg96/uF81NSqzeC97o+zModmFcJ4aWFAk8wpHDabwqI6uC9LleMWJ2Tq5ztLwLSbWVRk hdJYeJU+BLDC/LtVpUdFEbWkpsKbsKrRTwmffZpZsJa6YgmKGULraePJX6MJN7cAPuutmEg/v RuKlCqNJatEq28eyI6B9kv2r9Rd7lE2u0omfP1oGf6SBkrkGTaF2wPZzmuqTu+7pFpDLnDZ8Y gg8VVzuBhERPCFQ+jezo1gTQVfVO46gsTl6ypU0bVf3u0EEI6la3SvtVfaGMc2CQRtxRun71b 0xLXWYz2ByFwcu1qJ3LgabfX2HWbbOTo4KgLkrmpFq+SpdwFbj+ZeC796L52ug4/WzlN281Xz T+VmlskKYXV3TPc3h8UoAbQ6pnqMyLlHZWu0GUObne3NnUJy6LS5v4U890DKb4jburajB/esF cNfy7dL+twhohXECCJrUztSuDX8= X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772881010417103992 X-GMAIL-MSGID: 1772881010417103992 Replace offset handling code with a single call to memory_read_from_buffer() to simplify read_bmof(). Tested on a ASUS PRIME B650-PLUS. Reviewed-by: Thomas Weißschuh Tested-by: Thomas Weißschuh Signed-off-by: Armin Wolf --- Changes since v1: - add Reviewed-by and Tested-by tags --- drivers/platform/x86/wmi-bmof.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) -- 2.39.2 diff --git a/drivers/platform/x86/wmi-bmof.c b/drivers/platform/x86/wmi-bmof.c index d0516cacfcb5..644d2fd889c0 100644 --- a/drivers/platform/x86/wmi-bmof.c +++ b/drivers/platform/x86/wmi-bmof.c @@ -25,25 +25,13 @@ struct bmof_priv { struct bin_attribute bmof_bin_attr; }; -static ssize_t -read_bmof(struct file *filp, struct kobject *kobj, - struct bin_attribute *attr, - char *buf, loff_t off, size_t count) +static ssize_t read_bmof(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { - struct bmof_priv *priv = - container_of(attr, struct bmof_priv, bmof_bin_attr); + struct bmof_priv *priv = container_of(attr, struct bmof_priv, bmof_bin_attr); - if (off < 0) - return -EINVAL; - - if (off >= priv->bmofdata->buffer.length) - return 0; - - if (count > priv->bmofdata->buffer.length - off) - count = priv->bmofdata->buffer.length - off; - - memcpy(buf, priv->bmofdata->buffer.pointer + off, count); - return count; + return memory_read_from_buffer(buf, count, &off, priv->bmofdata->buffer.pointer, + priv->bmofdata->buffer.length); } static int wmi_bmof_probe(struct wmi_device *wdev, const void *context)