From nobody Fri Sep 12 02:31:39 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AA413C61DA4 for ; Tue, 14 Feb 2023 22:02:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233309AbjBNWCQ (ORCPT ); Tue, 14 Feb 2023 17:02:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233140AbjBNWB5 (ORCPT ); Tue, 14 Feb 2023 17:01:57 -0500 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8933830B2E; Tue, 14 Feb 2023 14:01:54 -0800 (PST) Received: by mail-wr1-x42a.google.com with SMTP id a2so17243159wrd.6; Tue, 14 Feb 2023 14:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=fa51H3f4eapSWiBabLmEx5vtaOrCOecKwtW5XZydamw=; b=TGC1OtiGHfVN5n4B9ebL14p5ELUTAPaQDqPR7LAkkGfm6Gjxe6+OIVaUMVBCfiRuAZ txO/voM/BY+W1Q0VhXKq0YdsIdt3lr6kpIZE2B7SbhcOMjC9QRLlBnzN5La8GxTV5JJO MZIm7hTJyeRu8EFYBdTbTvdKwW48FrA8QogNPFq3yZb2ef79FLekKR06XNAH/1dRnNV+ 4Ee9uQRCL3VdmDGIWQ726UZWfL5TVgl+QV51jzbtIqctJP3xRHW/7EiXz1HGnOtH1Qrb xomSJlUyinYeusQ01Idyjx/s1Ws2qoVvyyWIan9hUlYUAmq0h4jK8D2fWzPZu1S4bzQ/ 3vWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fa51H3f4eapSWiBabLmEx5vtaOrCOecKwtW5XZydamw=; b=WxEBeDgAR/YgbYBKXtJ8595hMupFzJRC1kOpmNGtexk9vtUV/qqteyzUXipPIFrZC6 OdMsJQBV7f54vz8EIKMscy7mckMuqnGes4eDIB//PKasJQUjQGs0V6EQWf7S2mE+F0+Y 6OUtbHiZi9zsRi2MOXwXDETF0KOcW0H+nPcQWX0ZNi051qB8a8cgozB299gwgZqsdUWp 1JbXoUpsA/IypTp9vNGiwUXmb2Zj5rSVXoKQbIGMg9/DDSeTVhM0rIIOO+AW8xuQ4368 0OgDTHVruqBlLSu+18G982kMmVMVgr0FddhAT/8z9lHzwBgj3yPH9Wish10nr4n2EeEz zR+Q== X-Gm-Message-State: AO0yUKXm1SuDSsZe7/Y8lzPPgNIT3Sevq762WrhghvhNSu4ZGYKivlQA gumATih83w3+bB5jpwkORu2iou6tNezYIA== X-Google-Smtp-Source: AK7set+hzVw8XX9Hzz6FT1XbLaH91lQbIJJEwutR3UKx/ebEWryobUwQpgZZclJH1g6Jjn2ZCTdVeg== X-Received: by 2002:adf:e78b:0:b0:2c5:53a1:eeb with SMTP id n11-20020adfe78b000000b002c553a10eebmr3685304wrm.54.1676412113006; Tue, 14 Feb 2023 14:01:53 -0800 (PST) Received: from localhost.localdomain ([2001:9e8:20f2:3300:c2d2:a008:b022:b1e0]) by smtp.gmail.com with ESMTPSA id u14-20020adff88e000000b002c56046a3b5sm4033704wrp.53.2023.02.14.14.01.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Feb 2023 14:01:52 -0800 (PST) From: Leonard Anderweit To: linux-hwmon@vger.kernel.org Cc: Aleksa Savic , Jack Doan , Jean Delvare , Guenter Roeck , Jonathan Corbet , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Leonard Anderweit Subject: [PATCH v2 3/6] hwmon: (aquacomputer_d5next) Device dependent control report settings Date: Tue, 14 Feb 2023 23:02:18 +0100 Message-Id: <20230214220221.15003-4-leonard.anderweit@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230214220221.15003-1-leonard.anderweit@gmail.com> References: <20230214220221.15003-1-leonard.anderweit@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add device dependent control report id, secondary control report id, second= ary control report size and secondary control report for devices which need different control report settings. All currently supported devices use the = same values. Signed-off-by: Leonard Anderweit --- drivers/hwmon/aquacomputer_d5next.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/hwmon/aquacomputer_d5next.c b/drivers/hwmon/aquacomput= er_d5next.c index f0c036d38e91..535d2fc0e55c 100644 --- a/drivers/hwmon/aquacomputer_d5next.c +++ b/drivers/hwmon/aquacomputer_d5next.c @@ -441,6 +441,10 @@ struct aqc_data { const char *name; =20 int status_report_id; /* Used for legacy devices, report is stored in buf= fer */ + int ctrl_report_id; + int secondary_ctrl_report_id; + int secondary_ctrl_report_size; + u8 *secondary_ctrl_report; =20 int buffer_size; u8 *buffer; @@ -513,7 +517,7 @@ static int aqc_get_ctrl_data(struct aqc_data *priv) int ret; =20 memset(priv->buffer, 0x00, priv->buffer_size); - ret =3D hid_hw_raw_request(priv->hdev, CTRL_REPORT_ID, priv->buffer, priv= ->buffer_size, + ret =3D hid_hw_raw_request(priv->hdev, priv->ctrl_report_id, priv->buffer= , priv->buffer_size, HID_FEATURE_REPORT, HID_REQ_GET_REPORT); if (ret < 0) ret =3D -ENODATA; @@ -535,15 +539,15 @@ static int aqc_send_ctrl_data(struct aqc_data *priv) put_unaligned_be16(checksum, priv->buffer + priv->checksum_offset); =20 /* Send the patched up report back to the device */ - ret =3D hid_hw_raw_request(priv->hdev, CTRL_REPORT_ID, priv->buffer, priv= ->buffer_size, + ret =3D hid_hw_raw_request(priv->hdev, priv->ctrl_report_id, priv->buffer= , priv->buffer_size, HID_FEATURE_REPORT, HID_REQ_SET_REPORT); if (ret < 0) return ret; =20 /* The official software sends this report after every change, so do it h= ere as well */ - ret =3D hid_hw_raw_request(priv->hdev, SECONDARY_CTRL_REPORT_ID, secondar= y_ctrl_report, - SECONDARY_CTRL_REPORT_SIZE, HID_FEATURE_REPORT, - HID_REQ_SET_REPORT); + ret =3D hid_hw_raw_request(priv->hdev, priv->secondary_ctrl_report_id, + priv->secondary_ctrl_report, priv->secondary_ctrl_report_size, + HID_FEATURE_REPORT, HID_REQ_SET_REPORT); return ret; } =20 @@ -1447,6 +1451,11 @@ static int aqc_probe(struct hid_device *hdev, const = struct hid_device_id *id) priv->serial_number_start_offset =3D AQC_SERIAL_START; priv->firmware_version_offset =3D AQC_FIRMWARE_VERSION; =20 + priv->ctrl_report_id =3D CTRL_REPORT_ID; + priv->secondary_ctrl_report_id =3D SECONDARY_CTRL_REPORT_ID; + priv->secondary_ctrl_report_size =3D SECONDARY_CTRL_REPORT_SIZE; + priv->secondary_ctrl_report =3D secondary_ctrl_report; + if (priv->kind =3D=3D aquastreamult) priv->fan_structure =3D &aqc_aquastreamult_fan_structure; else --=20 2.39.1