From patchwork Sun Jul 30 20:45:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Armin Wolf X-Patchwork-Id: 128287 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1671099vqg; Sun, 30 Jul 2023 14:35:55 -0700 (PDT) X-Google-Smtp-Source: APBJJlEEZUG4HcGTlLpjf+v72pLTlcNUH/3QhFUe6m/k9X5qd6vrH5R/eS56Ie9zkP6Zt+ELIG6B X-Received: by 2002:a05:6a00:1991:b0:668:98a1:5e9d with SMTP id d17-20020a056a00199100b0066898a15e9dmr9069913pfl.6.1690752955526; Sun, 30 Jul 2023 14:35:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690752955; cv=none; d=google.com; s=arc-20160816; b=gdW/Q3EpVod3niXyLtVr2YZUaboxNmR5Jtor0BWARZSHDSNJbp9ro56H4YzdstW8vd ncYOkQ+KgzuyJs2ekJ2e8kAR7OjFDk7M8bEWckgPNRIEusfvS5m0v/iUAZtHfBzGpvBz 6/S2jcDhwerEVCda1bGaltWi7/jsrzHaBosWLZfK61gT9vQ5Q+67C94HTU4po5AFi7lo W0qIcjkVs7Ql95CK+cQVtKZrJpu6/9UxhTJAnC1EVWmQSu+KlYM6eLw+L05ZGZIZ3oPK ukbOJhmlzigBt1eOmWxzjGSEdRnGdxX7ACREYFdijAbuMzo7yAqwyc2C1DZwkfI5Xk6Q c41w== 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=eVZ3lAs9vvNY2+YxClBuskvvXNH8aXvsphmvfnD2moCTgy03yLY2LYG1q9kqcEuqs7 DLLCY88NOY4jwAfptBJfJcCX81w/edDcHjQKhzKhCYXkWUKeCcm4unx+lpIq0VXDSPMx TS8ZyOdq1YoRea6295dxjLZihMHmLb7JdWAYmUnyoQyqz7Cwje+h5AeZmj/uRPGClnTU JN+SSARvw3BX+w8MmbSgiw2xrfxr+PPznYAmEEK58J9g1DBMrpJUCYkvt6CATQSS0Hnf eyM5j/yf2VabSyO4JDNSS07w1DkBaXnuMSaAzj+YqtjLwDcM90kXnzyB5W+Mr4G27uEc faAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmx.de header.s=s31663417 header.b=IKybR+WN; 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 u192-20020a6279c9000000b0065ef9f22da9si6200509pfc.19.2023.07.30.14.35.36; Sun, 30 Jul 2023 14:35:55 -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=IKybR+WN; 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 S229620AbjG3UqI (ORCPT + 99 others); Sun, 30 Jul 2023 16:46:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbjG3UqF (ORCPT ); Sun, 30 Jul 2023 16:46:05 -0400 Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C05710C2; Sun, 30 Jul 2023 13:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1690749955; x=1691354755; i=w_armin@gmx.de; bh=OHiBItOOoRVvdzRbZEFrTfef1epBD6WyUoDTx7C3Ghk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IKybR+WNJOQKc/aG8BwCeXjatw5zIg2Y3O2zP9gJH1F2NYHsIQE+MU5NhrMSo+vysYRyH3X E3e+GN7Z1S8bSHEnUQjEx3rKk6TElzpbw/CM4VbHW0DSnS/hQkOuVL0aL4MQ0oM9DAXp4wstd M9AjGf4hIpLWuAE6sTpyWxV6hy0rXv0a8Bc/xc6Rl4w1C3KMX5iHRnGQpuA9CT8JQc1sK8NYP 6InzxmmXY0e6Zi9iZbnFgXbbFbAv1DBhHAkwDJaA51K3xeu+spUoFRuvlXDWM3Fxmp1stirXg O8CM27TaNfc7IMbmgIBiQwEXIgsRiNlB98dN3vleCKygLqRpUTRQ== 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 (mrgmx105 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MxUnp-1pg60221iz-00xrH8; Sun, 30 Jul 2023 22:45:55 +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 v3 2/3] platform/x86: wmi-bmof: Simplify read_bmof() Date: Sun, 30 Jul 2023 22:45:49 +0200 Message-Id: <20230730204550.3402-2-W_Armin@gmx.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230730204550.3402-1-W_Armin@gmx.de> References: <20230730204550.3402-1-W_Armin@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:RIq5S3aLWtkYI0xsHrO1jSJmOv5Q9oS1vDYGh8VaEmCVVT+Txr9 C44oSTSPb3zkqwQ3GSnK9a0Dgj4f2j8ZUbQ2pXhYPdcB+4ZCj1PqvEoK+Jrw9ylgK11OREy XUa6dioYGfD3KrSmd6dgwDqkxOh3r4rUTc6XtgIqFRIebyey413Jn38HuSRIW7uJuXsAowQ 1CbXIcc3J2ANvLMJ7TCzg== UI-OutboundReport: notjunk:1;M01:P0:8RCZ0gKoDbk=;aIacZXI5yfzmafkD/YwTLQlAON/ EUg7z0dWypBlFJx8zDWuXR6oHvrRqg5tNMyr5Vh94JhHxvtDh8XaBYFvZ0pDd7s1tzS+7TIya 6f9ZawTaHZFuncQNTSzp93JtvCbkIk/ZC62rzlko+CkfkaWu4Pizsyi7vUIF9f381wUwEDmul UPGh+NrNHS7SBT6sFyEOMZ9WWJQqu4vunr6FjSiaSHnayfAR1FQteEAtNMirnfjXgy4qpGjwx 0urt2fzsqhNl9sRiekS6J0bCc3BbwpwNxKMbhtTuhVNCl1s+iXfk5qa2QFz0jqrNajlX3fyHa NqvKnLYYbxj2eHDum+sFCEA2Lox6FXQaNu02WMDOszDXeGLCwNHBg1+yGNDEGGF3ZDn1qH1KA JeXijk2bam/fw1XuOrl/CoycYDas7pqYSwmS93LRfjUKssll6mNnG+SQkAU3BBCzkl3pzw1dO 1sKDgbMG/SPyEdifBm9JW3Rg6HPtl/9IuQOcBmqDRsF3OUM5TTOS3eqes3Ws47etPdAhGaQvS 7wRyl1gJTUEWIOvGe8QWL/oowbsGZPbmljfWLtabzxlppyeO3OrX7jE6QJHd6jMuOcOhQboj6 zsb0QvH4vZzL7fv36yZ7iP8BfDTdw8lNCwctJyXcJ6FgF4zeFtcXKXBuaAsI4L08THJQlGIlJ CxLlxZoSYnTUkTpAg4WFOWlVQRZ0tIGHbPIfLy8ubEq0yu62IIzs4PvulQ/i7S3aBPvRpxUDS uqNFdXPsHe125y1rKZFxOKcfYwYf9gr3QVGZpHlL0kbW2vFNvBTgNCTP8J03LmkunNli1fcUZ xM03CZbuFjOMO76iQQ+oYVZehuSAGF484Ml/WAHRiS5A8wswnw7WooC1mg5lCkomMZ8rtDIyp 3iI0SHttOyS+BUIiyB/rDFqw9g7nre+zsKCSgNC5Mf1PtGK3rnuyeb+g8uCJLHaebrp8NCPPc LvisZ6xe3GsWqForJbAOIOYOl4M= 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_H4,RCVD_IN_MSPIKE_WL, 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: 1772882971096023211 X-GMAIL-MSGID: 1772882971096023211 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)