[PATCH net-next v12 3/5] net: dsa: motorcomm: use fixed-width GENMASK_U*() helpers

From: Kyle Switch

Date: Fri Oct 09 2026 - 08:39:08 EST


Some masks assigned to u16 and u32 fields are defined with
GENMASK(),which is an unsigned long constant and wider than
the field type on 64-bit builds. Convert the affected
internal_mask entries in chip.c and the YT921X_MBUS_CTRL_*
masks used by mdio_bus.c to fixed-width helpers.

This is a type cleanup only, with no functional change. Other
GENMASK() uses in the driver are intentionally left untouched.

Signed-off-by: Kyle Switch <kyle.switch@xxxxxxxxxxxxxx>
---
drivers/net/dsa/motorcomm/chip.c | 12 ++++++------
drivers/net/dsa/motorcomm/mdio_bus.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/dsa/motorcomm/chip.c b/drivers/net/dsa/motorcomm/chip.c
index 76bf68af8915..dbf9d20782a3 100644
--- a/drivers/net/dsa/motorcomm/chip.c
+++ b/drivers/net/dsa/motorcomm/chip.c
@@ -36,19 +36,19 @@
static const struct yt921x_info yt921x_infos[] = {
{
"YT9215SC", YT9215_MAJOR, 1, 0,
- GENMASK(4, 0),
+ GENMASK_U16(4, 0),
BIT(9),
BIT(8) | BIT(9),
},
{
"YT9215S", YT9215_MAJOR, 2, 0,
- GENMASK(4, 0),
+ GENMASK_U16(4, 0),
BIT(9),
BIT(8),
},
{
"YT9215RB", YT9215_MAJOR, 3, 0,
- GENMASK(4, 0),
+ GENMASK_U16(4, 0),
BIT(8) | BIT(9),
0,
},
@@ -66,13 +66,13 @@ static const struct yt921x_info yt921x_infos[] = {
},
{
"YT9218N", YT9218_MAJOR, 0, 0,
- GENMASK(7, 0),
+ GENMASK_U16(7, 0),
0,
0,
},
{
"YT9218MB", YT9218_MAJOR, 1, 0,
- GENMASK(7, 0),
+ GENMASK_U16(7, 0),
BIT(8) | BIT(9),
BIT(8) | BIT(9),
},
@@ -3741,7 +3741,7 @@ static int yt921x_chip_setup_dsa(struct yt921x_priv *priv)
if (res)
return res;

- ctrl = GENMASK(10, 0);
+ ctrl = GENMASK_U32(10, 0);
res = yt921x_reg_write(priv, YT921X_FILTER_UNK_UCAST, ctrl);
if (res)
return res;
diff --git a/drivers/net/dsa/motorcomm/mdio_bus.c b/drivers/net/dsa/motorcomm/mdio_bus.c
index 83f0212551ff..3aa1111efaa4 100644
--- a/drivers/net/dsa/motorcomm/mdio_bus.c
+++ b/drivers/net/dsa/motorcomm/mdio_bus.c
@@ -159,7 +159,7 @@ int yt921x_mbus_int_init(struct yt921x_priv *priv, struct device_node *mnp)
mbus->write = yt921x_mbus_int_write;
mbus->parent = dev;
max_ports = priv->series->max_ports;
- mbus->phy_mask = (u32)~GENMASK(max_ports - 1, 0);
+ mbus->phy_mask = ~GENMASK_U32(max_ports - 1, 0);

res = devm_of_mdiobus_register(dev, mbus, mnp);
if (res)
--
2.25.1