Commit 4a7bbaa6 authored by Ethan Nelson-Moore's avatar Ethan Nelson-Moore Committed by Jakub Kicinski
Browse files

net: usb: sr9700: rename register write commands for clarity 



SR_WR_REG and SR_WR_REGS may be confused at a cursory glance. Rename
them to be more easily differentiated to prevent this.

Suggested-by: default avatarAndrew Lunn <andrew+netdev@lunn.ch>
Signed-off-by: default avatarEthan Nelson-Moore <enelsonmoore@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarPeter Korsgaard <peter@korsgaard.com>
Link: https://patch.msgid.link/20260123080409.64165-1-enelsonmoore@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c2e99887

drivers/net/usb/sr9700.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static int sr_write(struct usbnet *dev, u8 reg, u16 length, void *data) 
{

	int err;



	err = usbnet_write_cmd(dev, SR_WR_REGS, SR_REQ_WR_REG, 0, reg, data,

	err = usbnet_write_cmd(dev, SR_WR_MULTIPLE_REGS, SR_REQ_WR_REG, 0, reg, data,

			       length);

	if ((err >= 0) && (err < length))

		err = -EINVAL;
@@ -51,20 +51,20 @@ static int sr_read_reg(struct usbnet *dev, u8 reg, u8 *value) 


static int sr_write_reg(struct usbnet *dev, u8 reg, u8 value)

{

	return usbnet_write_cmd(dev, SR_WR_REG, SR_REQ_WR_REG,

	return usbnet_write_cmd(dev, SR_WR_SINGLE_REG, SR_REQ_WR_REG,

				value, reg, NULL, 0);

}



static void sr_write_async(struct usbnet *dev, u8 reg, u16 length,

			   const void *data)

{

	usbnet_write_cmd_async(dev, SR_WR_REGS, SR_REQ_WR_REG,

	usbnet_write_cmd_async(dev, SR_WR_MULTIPLE_REGS, SR_REQ_WR_REG,

			       0, reg, data, length);

}



static void sr_write_reg_async(struct usbnet *dev, u8 reg, u8 value)

{

	usbnet_write_cmd_async(dev, SR_WR_REG, SR_REQ_WR_REG,

	usbnet_write_cmd_async(dev, SR_WR_SINGLE_REG, SR_REQ_WR_REG,

			       value, reg, NULL, 0);

}

drivers/net/usb/sr9700.h

+2 −2
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ 


/* Register access commands and flags */

#define	SR_RD_REGS		0x00

#define	SR_WR_REGS		0x01

#define	SR_WR_REG		0x03

#define	SR_WR_MULTIPLE_REGS	0x01

#define	SR_WR_SINGLE_REG	0x03

#define	SR_REQ_RD_REG	(USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE)

#define	SR_REQ_WR_REG	(USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE)