From patchwork Sat Nov 18 18:04:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 166618 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9910:0:b0:403:3b70:6f57 with SMTP id i16csp1305411vqn; Sat, 18 Nov 2023 10:06:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IF9g+bK7UUawcQZKzQyt8i+rOyJr4UMwAK0ajKoLNTX0m5t3nDJ6qbMQ0SWukWQkMbY/X1T X-Received: by 2002:a05:6870:a353:b0:1ea:746d:1703 with SMTP id y19-20020a056870a35300b001ea746d1703mr3246239oak.7.1700330797475; Sat, 18 Nov 2023 10:06:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700330797; cv=none; d=google.com; s=arc-20160816; b=BI2pn+DLFZ/KzESacpMUPDfgt+ay9VQ/jEiMtvannbj61DDpqEu1j4gVydjY1oa/Q2 fdCY1crzUoDDakvi1J2Mkpq3ehIe5SuNTjPzuGQ8U7C+1Zkgo7e7MotDLqJ1wfkeReBw HsJU+HsmFPog90n3KRxeA+LgGCGbwmkAyP9TsThjS8O8cZ6aty6Luy8LbjiJdwGJy6K4 9Y33llRLgqbkH6Kppq9180AUdz440BEjdgnySrAhluvqpIn+e/imkgh97VR2Mf2oAVYS A6w+LwtlvO94PTt0QYZONl7UO/UubdCE2V25AluHXIqOiKyIsGuuXYfXJIObysrYjkzQ vRcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/0nkqP7LXHiV+g9f41wgueZKbqep4eUIQUImirIqSFg=; fh=YshMKtjk9iJgU9KuC7p36lBo5xQZfviRPYCdJsl0y8Q=; b=VgmeVHckWmSdhHKCN5ygGSKYgUqF6tE+ydlvxST8rbJlWqzc+KLy+D/DmbvHbeWqMJ BNwgpvSLdE81dXANCGCiEeUDfH/jT7vEIxBTGVzmGH5nNya4ZLm+c8zTks3katyafB5L GLJoxCSQVAsfnf/R5EEYAjdJuYTr3GtuRaCOI1Ecb/3vUx4+wWrq82TpseQ35puAzbdb g9H6jU6w2uEeA8ktaVgYK4FK4dKa0miHM0X1UkI7g8YN5FhOBJjjwGB+0yhQ5EghNjjJ 4LqIU9BDE7H5OyS6O+qveZMp5OfPTZeDpKVydMin6PE42eKJAblVNXVXTH1KuskYhlbK 0nDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LrsSZN3v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id g8-20020aa79f08000000b006c06614f4b1si4513066pfr.137.2023.11.18.10.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 10:06:37 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=LrsSZN3v; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 05E648087249; Sat, 18 Nov 2023 10:06:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230292AbjKRSF3 (ORCPT + 29 others); Sat, 18 Nov 2023 13:05:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230337AbjKRSFT (ORCPT ); Sat, 18 Nov 2023 13:05:19 -0500 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84B18F2; Sat, 18 Nov 2023 10:05:15 -0800 (PST) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-9e1fb7faa9dso421269566b.2; Sat, 18 Nov 2023 10:05:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1700330714; x=1700935514; darn=vger.kernel.org; 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=/0nkqP7LXHiV+g9f41wgueZKbqep4eUIQUImirIqSFg=; b=LrsSZN3vxvkQeerPA3NlzAqSqwVMYsbrB2l0FVo/YRqbnobJnV3coUUpp31K47z5Mz cIL+IzG8swqNWo4qRRKxsgLbUaCTpcYXa3qBHaE4lIQ2SA6l0GuSq+Y5YUqDO5CG3UPD 3y+5oGFWsZEfj6dn/rwgjwhpBz0c5Yy1miA3LznBoOQo0aG4Ev7AZ7sQx8+4D2Vn1jLH 51nbcT2h7j6H0Yv9fq77cRbeQFTxeEdWHwhYJThu4nH7flTHgsEbIIWUXOJoZdl+80qQ sEH++kMS8cjBGKH8vCqN0VFpAClY1XgJbacP88vtSAyKKB58t9Ch2fmXD6N6sstJX8DQ Mu0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700330714; x=1700935514; 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=/0nkqP7LXHiV+g9f41wgueZKbqep4eUIQUImirIqSFg=; b=O/I145edKI8Ik765xg5v7BSwGDcEblLVgblVCO9jG5U5Bd1AbOhQO/rO+I9Q+GyHgv SiTzH/DLEOGd8JRANkrL5EtBPSP71w0574/nN6KWAoU2xidZfDjE/TGLFCg0NN+6V3iG iu2iw+ltRRFCBgxlUGGt7UtVT6iosB8Y7W6BmrKfZPENoRuMj3+xFcThUaw/PRvtFoaB Fv5R6BQEOzJZ2EybrVJzOxPt9YHTXw4Zxdao3Thb3knnWYhIUep/LrmclTdtMF7LzB0N 7Rs+uvhmqDUk8chbizrSBst38NoOQTVlvDoLkInNBohSsVyw6vmDfr4z8Fi55Ry4ze+m tpAQ== X-Gm-Message-State: AOJu0YzRzlWEEfE9UyQkluGiVE7u/xK5AgKyefmiJhYDIOfcXQumHLsC 945HeKoqsCrtV0p+0YtSD0o= X-Received: by 2002:a17:906:3799:b0:9e6:59d5:80c5 with SMTP id n25-20020a170906379900b009e659d580c5mr1924503ejc.23.1700330713839; Sat, 18 Nov 2023 10:05:13 -0800 (PST) Received: from zotac.lan. (dynamic-2a01-0c22-77bf-8300-2223-08ff-fe18-0310.c22.pool.telefonica.de. [2a01:c22:77bf:8300:2223:8ff:fe18:310]) by smtp.gmail.com with ESMTPSA id m20-20020a1709062b9400b009f2c769b4ebsm2079456ejg.151.2023.11.18.10.05.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 18 Nov 2023 10:05:13 -0800 (PST) From: Heiner Kallweit To: Wolfram Sang , Andi Shyti Cc: linux-i2c@vger.kernel.org, Heiner Kallweit , linux-kernel@vger.kernel.org Subject: [PATCH 05/10] drivers/i2c/busses: Don't let i2c adapters declare I2C_CLASS_SPD support if they support I2C_CLASS_HWMON Date: Sat, 18 Nov 2023 19:04:59 +0100 Message-ID: <20231118180504.1785-6-hkallweit1@gmail.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231118180504.1785-1-hkallweit1@gmail.com> References: <20231118180504.1785-1-hkallweit1@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Sat, 18 Nov 2023 10:06:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782926049885221997 X-GMAIL-MSGID: 1782926066277754046 After removal of the legacy eeprom driver the only remaining I2C client device driver supporting I2C_CLASS_SPD is jc42. Because this driver also supports I2C_CLASS_HWMON, adapters don't have to declare support for I2C_CLASS_SPD if they support I2C_CLASS_HWMON. It's one step towards getting rid of I2C_CLASS_SPD mid-term. Series was created supported by Coccinelle and its splitpatch. Signed-off-by: Heiner Kallweit --- drivers/i2c/busses/i2c-elektor.c | 2 +- drivers/i2c/busses/i2c-ibm_iic.c | 2 +- drivers/i2c/busses/i2c-iop3xx.c | 2 +- drivers/i2c/busses/i2c-kempld.c | 4 ++-- drivers/i2c/busses/i2c-scmi.c | 2 +- drivers/i2c/busses/i2c-sh7760.c | 2 +- drivers/i2c/busses/i2c-sibyte.c | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index b0f50dce9..cfe8665ca 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c @@ -188,7 +188,7 @@ static struct i2c_algo_pcf_data pcf_isa_data = { static struct i2c_adapter pcf_isa_ops = { .owner = THIS_MODULE, - .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, + .class = I2C_CLASS_HWMON, .algo_data = &pcf_isa_data, .name = "i2c-elektor", }; diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c index 408820319..7fb87b789 100644 --- a/drivers/i2c/busses/i2c-ibm_iic.c +++ b/drivers/i2c/busses/i2c-ibm_iic.c @@ -739,7 +739,7 @@ static int iic_probe(struct platform_device *ofdev) adap->dev.of_node = of_node_get(np); strscpy(adap->name, "IBM IIC", sizeof(adap->name)); i2c_set_adapdata(adap, dev); - adap->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; + adap->class = I2C_CLASS_HWMON; adap->algo = &iic_algo; adap->timeout = HZ; diff --git a/drivers/i2c/busses/i2c-iop3xx.c b/drivers/i2c/busses/i2c-iop3xx.c index f2f7ebeea..2e5f0165c 100644 --- a/drivers/i2c/busses/i2c-iop3xx.c +++ b/drivers/i2c/busses/i2c-iop3xx.c @@ -478,7 +478,7 @@ iop3xx_i2c_probe(struct platform_device *pdev) memcpy(new_adapter->name, pdev->name, strlen(pdev->name)); new_adapter->owner = THIS_MODULE; - new_adapter->class = I2C_CLASS_HWMON | I2C_CLASS_SPD; + new_adapter->class = I2C_CLASS_HWMON; new_adapter->dev.parent = &pdev->dev; new_adapter->dev.of_node = pdev->dev.of_node; new_adapter->nr = pdev->id; diff --git a/drivers/i2c/busses/i2c-kempld.c b/drivers/i2c/busses/i2c-kempld.c index e01d75308..9076ae4d7 100644 --- a/drivers/i2c/busses/i2c-kempld.c +++ b/drivers/i2c/busses/i2c-kempld.c @@ -283,8 +283,8 @@ static const struct i2c_algorithm kempld_i2c_algorithm = { static const struct i2c_adapter kempld_i2c_adapter = { .owner = THIS_MODULE, .name = "i2c-kempld", - .class = I2C_CLASS_HWMON | I2C_CLASS_SPD | - I2C_CLASS_DEPRECATED, + .class = I2C_CLASS_HWMON | + I2C_CLASS_DEPRECATED, .algo = &kempld_i2c_algorithm, }; diff --git a/drivers/i2c/busses/i2c-scmi.c b/drivers/i2c/busses/i2c-scmi.c index 421735acf..d7af8e0d7 100644 --- a/drivers/i2c/busses/i2c-scmi.c +++ b/drivers/i2c/busses/i2c-scmi.c @@ -385,7 +385,7 @@ static int smbus_cmi_probe(struct platform_device *device) smbus_cmi->adapter.owner = THIS_MODULE; smbus_cmi->adapter.algo = &acpi_smbus_cmi_algorithm; smbus_cmi->adapter.algo_data = smbus_cmi; - smbus_cmi->adapter.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; + smbus_cmi->adapter.class = I2C_CLASS_HWMON; smbus_cmi->adapter.dev.parent = &device->dev; ret = i2c_add_adapter(&smbus_cmi->adapter); diff --git a/drivers/i2c/busses/i2c-sh7760.c b/drivers/i2c/busses/i2c-sh7760.c index 1ad2a2615..8a043f5fc 100644 --- a/drivers/i2c/busses/i2c-sh7760.c +++ b/drivers/i2c/busses/i2c-sh7760.c @@ -477,7 +477,7 @@ static int sh7760_i2c_probe(struct platform_device *pdev) id->adap.nr = pdev->id; id->adap.algo = &sh7760_i2c_algo; - id->adap.class = I2C_CLASS_HWMON | I2C_CLASS_SPD; + id->adap.class = I2C_CLASS_HWMON; id->adap.retries = 3; id->adap.algo_data = id; id->adap.dev.parent = &pdev->dev; diff --git a/drivers/i2c/busses/i2c-sibyte.c b/drivers/i2c/busses/i2c-sibyte.c index 8f71f01cb..49f8f4f1b 100644 --- a/drivers/i2c/busses/i2c-sibyte.c +++ b/drivers/i2c/busses/i2c-sibyte.c @@ -142,7 +142,7 @@ static struct i2c_algo_sibyte_data sibyte_board_data[2] = { static struct i2c_adapter sibyte_board_adapter[2] = { { .owner = THIS_MODULE, - .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, + .class = I2C_CLASS_HWMON, .algo = NULL, .algo_data = &sibyte_board_data[0], .nr = 0, @@ -150,7 +150,7 @@ static struct i2c_adapter sibyte_board_adapter[2] = { }, { .owner = THIS_MODULE, - .class = I2C_CLASS_HWMON | I2C_CLASS_SPD, + .class = I2C_CLASS_HWMON, .algo = NULL, .algo_data = &sibyte_board_data[1], .nr = 1,