From nobody Mon Feb 9 08:29:23 2026 Received: from mail-dy1-f172.google.com (mail-dy1-f172.google.com [74.125.82.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 099913346B9 for ; Sat, 31 Jan 2026 07:38:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769845131; cv=none; b=szk5AXSep4wwUOlglu2IsnWg5ODxqjBl+czr6nzI8GnqkfpVk/wHkgwEXnGi+CD3pZpDuB9Ryy/SccqoF3oliJFTHVJs3HbXCgThrnqjgEI8rqyTm2aAetQe0mvhoOPHe1MFnCCyaPcXoRT7eWkZxNqLqDmVSnL/CsR47kmeIS8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769845131; c=relaxed/simple; bh=2hehsSc95k8OiROw8SZieahI+zCiELEJXRh0+GjuEuo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mmx1Y6EjxfGpV2YWJne/poB78ZQpsX9o08t5eAjhiFvE9Y3/pT84WrkcQqnsimuLS9Nm/1Tx4ZBrxRn9hT/TBSfuji49IgldXe0lSU0j+NwNPQquQTGRsAsCqYJElN9FgVX5lPJRs7NbsMGfKjEeYtNWzpdU2CTXKQExeexyNIU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L5afbkXH; arc=none smtp.client-ip=74.125.82.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L5afbkXH" Received: by mail-dy1-f172.google.com with SMTP id 5a478bee46e88-2b71557299dso3052443eec.1 for ; Fri, 30 Jan 2026 23:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769845129; x=1770449929; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=WgmpbHGAysGvtiudNoXzc7HtntppszTMpEWpHobWzc0=; b=L5afbkXHC/xqyfwP6Jeu2ylsv1fgKmeghWqfKja/JyjGhtFeu5R8XY6by1IO/SA5vr bo3Noac4frKkBSIL7LTZezTud8OuQEsh6a+eAKKn3kCxxZMmqya2mHnMztQQKOuxfdBy X9NlbaAiEE5Kh0zpfqbdF7pfXiL7BqNDm7QDqzRKUCQSVcJ3spqFVMrN1Z7/uMllDdZg ESPpDpZ2eQe2pjBoNVub+GsFrvMAOdh8ge2v5GWawo1Ex51hsmPHwM7DZR6RAVpt3xhd Ko6XKxXllYZMlesiwHVZhdVRcg1HIC/yfp2gq9CxyZ7XUiuGUw6lDK4hFcnIKWaCjf+w f4bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769845129; x=1770449929; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=WgmpbHGAysGvtiudNoXzc7HtntppszTMpEWpHobWzc0=; b=HVMvdaUXkWZB/E+L7aVxzjomzPrllAn7PgpvnYbMM/o4OzlnY99R0bHm6qObL7BXLt ZvzS6xcQioHWTEt6C7sbiTmoWoXwOVgSDpLBRELNiXtt/BLc/kloeKnYaWGWcCu36uIg p+vt1zlzVFX/YjXA3DMk9Pu+M8XWeDqrv+yU6xvC2fzIly4u//dpNO0j12ITQF9QG33S NIn3p1vnQzxBiGz4JMp4UVOnQjMNh3LUvcGX/kCYuaPN5PqYJkztzdOn+D8xQUv3KZ0K 7XOx8khL0odjaZNgEgg3pqbBC1DVj6+M+gLhfJw30SnTAtQsgr7lgqHvPgGngdNmHq9i uVpQ== X-Forwarded-Encrypted: i=1; AJvYcCUvqxDaF1irr33zoRY66pS8BsDXobfUo/btWtdfo+aB0sqWaQwVBy6Wx208XMtf8SFked+wTmPtT69w+lk=@vger.kernel.org X-Gm-Message-State: AOJu0Yw0ZpaxFrC2XLYvMBU+djJrmxJ77i+jCeRa531ij9yzyfhd4t3/ hj9JtzB/ldpLvErgP3Zte9Uuvr3Ef77QYjI1wsHKRTMaqx5pUGSKeciD X-Gm-Gg: AZuq6aICKd7KXrzU/ZXXhKNwTjB2D5gF8E3DCpLEAjbuCwFGDidzARV8UfaiJHf30X6 EZHTjYhkrliWpJvYL94GOTyA57GECAMCos2VtRWw6i+jAe8JdOLvcte1LxBNlTPCT0Fp4GTDMQ3 JQvOtL41UJwtTugrHE40COFNM3A0lemOPZAaH6i3m/Dpbd5BEeSMgFS14jXqUcfUxMp/+gpNOyN rFyvqJQJJbbsTymcbN+MSqwHhN4pMmJu5zPdR+zk0heQ7wBP1QUVfCec1V2gfSpCq9m9NV30mFf qOpCx/QN+QNKHyZB6Kkvi9vPMGQanT7nMCrYHRHjHumIWSiwMOJNsyqKFEB4FWqCoKIZ9RVjIVh n7Uo4cnwYImA7JezqDABYuXpxnofcBWd6j2/GDgPmELOUvwNql5yXXpsl2/eGINt8p3nKmuGMZC KgfrlvvJvfiLbZluRBJeGkcQFLvw== X-Received: by 2002:a05:7300:ad08:b0:2b0:4c5f:c05c with SMTP id 5a478bee46e88-2b7c862d9b9mr2495071eec.4.1769845129285; Fri, 30 Jan 2026 23:38:49 -0800 (PST) Received: from [192.168.0.61] ([76.174.137.141]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b7a16cf8d6sm14337027eec.3.2026.01.30.23.38.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jan 2026 23:38:47 -0800 (PST) From: Michael Harris Date: Fri, 30 Jan 2026 23:38:28 -0800 Subject: [PATCH 2/2] staging: iio: adt7316: convert magic numbers to BIT() and GENMASK() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260130-adt7316-correct-macros-v1-2-8a71df1e42f1@gmail.com> References: <20260130-adt7316-correct-macros-v1-0-8a71df1e42f1@gmail.com> In-Reply-To: <20260130-adt7316-correct-macros-v1-0-8a71df1e42f1@gmail.com> To: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Greg Kroah-Hartman Cc: David Lechner , =?utf-8?q?Nuno_S=C3=A1?= , Andy Shevchenko , linux-iio@vger.kernel.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Michael Harris X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1769845124; l=6212; i=michaelharriscode@gmail.com; s=20260130; h=from:subject:message-id; bh=2hehsSc95k8OiROw8SZieahI+zCiELEJXRh0+GjuEuo=; b=OXpV7JxGwGsE9bqpWBETLPpcYUVx5Klh2SzCVu+PC7ktEzLDrBXJT3SFAllV06VWTLUP6Fmyj spe/NgY2DG5CZBTsV0BDxg336Dj2Y/hjBv+yVGpmBsUHXHkuHpOW+fo X-Developer-Key: i=michaelharriscode@gmail.com; a=ed25519; pk=td/zQD3XANAhdG3Kf3mSetXiynk1Ql0eM4s0+eks5DU= Improve readability by converting raw hex macros to use BIT() or GENMASK() instead. Update a few sysfs_emit() string formats to expect the unsigned long type given by BIT() and GENMASK() and prevent compiler errors. Signed-off-by: Michael Harris --- drivers/staging/iio/addac/adt7316.c | 80 ++++++++++++++++++---------------= ---- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/staging/iio/addac/adt7316.c b/drivers/staging/iio/adda= c/adt7316.c index 4173c8822fff495e8c69d9cf6c11be9e9227a8c1..0af7e18ff9684993622a268110f= 0a17c0bff3616 100644 --- a/drivers/staging/iio/addac/adt7316.c +++ b/drivers/staging/iio/addac/adt7316.c @@ -29,11 +29,11 @@ #define ADT7316_INT_STAT1 0x0 #define ADT7316_INT_STAT2 0x1 #define ADT7316_LSB_IN_TEMP_VDD 0x3 -#define ADT7316_LSB_IN_TEMP_MASK 0x3 -#define ADT7316_LSB_VDD_MASK 0xC +#define ADT7316_LSB_IN_TEMP_MASK GENMASK(1, 0) +#define ADT7316_LSB_VDD_MASK GENMASK(3, 2) #define ADT7316_LSB_VDD_OFFSET 2 #define ADT7316_LSB_EX_TEMP_AIN 0x4 -#define ADT7316_LSB_EX_TEMP_MASK 0x3 +#define ADT7316_LSB_EX_TEMP_MASK GENMASK(1, 0) #define ADT7516_LSB_AIN_SHIFT 2 #define ADT7316_AD_MSB_DATA_BASE 0x6 #define ADT7316_AD_MSB_DATA_REGS 3 @@ -88,19 +88,19 @@ /* * ADT7316 config1 */ -#define ADT7316_EN 0x1 -#define ADT7516_SEL_EX_TEMP 0x4 -#define ADT7516_SEL_AIN1_2_EX_TEMP_MASK 0x6 -#define ADT7516_SEL_AIN3 0x8 -#define ADT7316_INT_EN 0x20 -#define ADT7316_INT_POLARITY 0x40 -#define ADT7316_PD 0x80 +#define ADT7316_EN BIT(0) +#define ADT7516_SEL_EX_TEMP BIT(2) +#define ADT7516_SEL_AIN1_2_EX_TEMP_MASK GENMASK(2, 1) +#define ADT7516_SEL_AIN3 BIT(3) +#define ADT7316_INT_EN BIT(5) +#define ADT7316_INT_POLARITY BIT(6) +#define ADT7316_PD BIT(7) =20 /* * ADT7316 config2 */ -#define ADT7316_AD_SINGLE_CH_MASK 0x3 -#define ADT7516_AD_SINGLE_CH_MASK 0x7 +#define ADT7316_AD_SINGLE_CH_MASK GENMASK(1, 0) +#define ADT7516_AD_SINGLE_CH_MASK GENMASK(2, 0) #define ADT7316_AD_SINGLE_CH_VDD 0 #define ADT7316_AD_SINGLE_CH_IN 1 #define ADT7316_AD_SINGLE_CH_EX 2 @@ -108,54 +108,54 @@ #define ADT7516_AD_SINGLE_CH_AIN2 3 #define ADT7516_AD_SINGLE_CH_AIN3 4 #define ADT7516_AD_SINGLE_CH_AIN4 5 -#define ADT7316_AD_SINGLE_CH_MODE 0x10 -#define ADT7316_DISABLE_AVERAGING 0x20 -#define ADT7316_EN_SMBUS_TIMEOUT 0x40 +#define ADT7316_AD_SINGLE_CH_MODE BIT(4) +#define ADT7316_DISABLE_AVERAGING BIT(5) +#define ADT7316_EN_SMBUS_TIMEOUT BIT(6) =20 /* * ADT7316 config3 */ -#define ADT7316_ADCLK_22_5 0x1 -#define ADT7316_DA_HIGH_RESOLUTION 0x2 -#define ADT7316_DA_EN_VIA_DAC_LDAC 0x8 -#define ADT7516_AIN_IN_VREF 0x10 -#define ADT7316_EN_IN_TEMP_PROP_DACA 0x20 -#define ADT7316_EN_EX_TEMP_PROP_DACB 0x40 +#define ADT7316_ADCLK_22_5 BIT(0) +#define ADT7316_DA_HIGH_RESOLUTION BIT(1) +#define ADT7316_DA_EN_VIA_DAC_LDAC BIT(3) +#define ADT7516_AIN_IN_VREF BIT(4) +#define ADT7316_EN_IN_TEMP_PROP_DACA BIT(5) +#define ADT7316_EN_EX_TEMP_PROP_DACB BIT(6) =20 /* * ADT7316 DAC config */ -#define ADT7316_DA_2VREF_CH_MASK 0xF -#define ADT7316_DA_EN_MODE_MASK 0x30 +#define ADT7316_DA_2VREF_CH_MASK GENMASK(3, 0) +#define ADT7316_DA_EN_MODE_MASK GENMASK(5, 4) #define ADT7316_DA_EN_MODE_SHIFT 4 #define ADT7316_DA_EN_MODE_SINGLE 0x00 #define ADT7316_DA_EN_MODE_AB_CD 0x10 #define ADT7316_DA_EN_MODE_ABCD 0x20 #define ADT7316_DA_EN_MODE_LDAC 0x30 -#define ADT7316_VREF_BYPASS_DAC_AB 0x40 -#define ADT7316_VREF_BYPASS_DAC_CD 0x80 +#define ADT7316_VREF_BYPASS_DAC_AB BIT(6) +#define ADT7316_VREF_BYPASS_DAC_CD BIT(7) =20 /* * ADT7316 LDAC config */ -#define ADT7316_LDAC_EN_DA_MASK 0xF -#define ADT7316_DAC_IN_VREF 0x10 -#define ADT7516_DAC_AB_IN_VREF 0x10 -#define ADT7516_DAC_CD_IN_VREF 0x20 +#define ADT7316_LDAC_EN_DA_MASK GENMASK(3, 0) +#define ADT7316_DAC_IN_VREF BIT(4) +#define ADT7516_DAC_AB_IN_VREF BIT(4) +#define ADT7516_DAC_CD_IN_VREF BIT(5) #define ADT7516_DAC_IN_VREF_OFFSET 4 -#define ADT7516_DAC_IN_VREF_MASK 0x30 +#define ADT7516_DAC_IN_VREF_MASK GENMASK(5, 4) =20 /* * ADT7316 INT_MASK2 */ -#define ADT7316_INT_MASK2_VDD 0x10 +#define ADT7316_INT_MASK2_VDD BIT(4) =20 /* * ADT7316 value masks */ -#define ADT7316_T_VALUE_SIGN 0x400 +#define ADT7316_T_VALUE_SIGN BIT(10) #define ADT7316_T_VALUE_FLOAT_OFFSET 2 -#define ADT7316_T_VALUE_FLOAT_MASK 0x2 +#define ADT7316_T_VALUE_FLOAT_MASK BIT(1) =20 /* * Chip ID @@ -167,7 +167,7 @@ #define ID_ADT7517 0x12 #define ID_ADT7519 0x14 =20 -#define ID_FAMILY_MASK 0xF0 +#define ID_FAMILY_MASK GENMASK(7, 4) #define ID_ADT73XX 0x0 #define ID_ADT75XX 0x10 =20 @@ -192,9 +192,9 @@ struct adt7316_chip_info { * Logic interrupt mask for user application to enable * interrupts. */ -#define ADT7316_VDD_INT_MASK 0x100 -#define ADT7316_TEMP_INT_MASK 0x1F -#define ADT7516_AIN_INT_MASK 0xE0 +#define ADT7316_VDD_INT_MASK BIT(8) +#define ADT7316_TEMP_INT_MASK GENMASK(4, 0) +#define ADT7516_AIN_INT_MASK GENMASK(7, 5) #define ADT7316_TEMP_AIN_INT_MASK \ (ADT7316_TEMP_INT_MASK) =20 @@ -783,7 +783,7 @@ static ssize_t adt7316_show_DAC_2Vref_ch_mask(struct de= vice *dev, struct iio_dev *dev_info =3D dev_to_iio_dev(dev); struct adt7316_chip_info *chip =3D iio_priv(dev_info); =20 - return sysfs_emit(buf, "0x%x\n", + return sysfs_emit(buf, "0x%lx\n", chip->dac_config & ADT7316_DA_2VREF_CH_MASK); } =20 @@ -1023,7 +1023,7 @@ static ssize_t adt7316_show_DAC_internal_Vref(struct = device *dev, struct adt7316_chip_info *chip =3D iio_priv(dev_info); =20 if ((chip->id & ID_FAMILY_MASK) =3D=3D ID_ADT75XX) - return sysfs_emit(buf, "0x%x\n", + return sysfs_emit(buf, "0x%lx\n", (chip->ldac_config & ADT7516_DAC_IN_VREF_MASK) >> ADT7516_DAC_IN_VREF_OFFSET); return sysfs_emit(buf, "%d\n", @@ -1146,7 +1146,7 @@ static ssize_t adt7316_show_ad(struct adt7316_chip_in= fo *chip, sign =3D '-'; } =20 - return sysfs_emit(buf, "%c%d.%.2d\n", sign, + return sysfs_emit(buf, "%c%d.%.2ld\n", sign, (data >> ADT7316_T_VALUE_FLOAT_OFFSET), (data & ADT7316_T_VALUE_FLOAT_MASK) * 25); } --=20 2.52.0