]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
scsi: usb: Rename the RESERVE and RELEASE constants
authorBart Van Assche <bvanassche@acm.org>
Mon, 10 Feb 2025 20:50:09 +0000 (12:50 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 May 2025 09:13:25 +0000 (11:13 +0200)
commitf3a41d5af15f42aef8b47b0345ce00a4dbe6ee54
tree9d9f50e23dabec1e76bb1cb963792bcad8f9c719
parent6ef8067def5c76397299816e28f1ff8a950c2281
scsi: usb: Rename the RESERVE and RELEASE constants

[ Upstream commit 0ea163a18b17f9e0f8350bb348ae69c4a376be66 ]

The names RESERVE and RELEASE are not only used in <scsi/scsi_proto.h> but
also elsewhere in the kernel:

$ git grep -nHE 'define[[:blank:]]*(RESERVE|RELEASE)[[:blank:]]'
drivers/input/joystick/walkera0701.c:13:#define RESERVE 20000
drivers/s390/char/tape_std.h:56:#define RELEASE 0xD4 /* 3420 NOP, 3480 REJECT */
drivers/s390/char/tape_std.h:58:#define RESERVE 0xF4 /* 3420 NOP, 3480 REJECT */

Additionally, while the names of the symbolic constants RESERVE_10 and
RELEASE_10 include the command length, the command length is not included
in the RESERVE and RELEASE names. Address both issues by renaming the
RESERVE and RELEASE constants into RESERVE_6 and RELEASE_6 respectively.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20250210205031.2970833-1-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
14 files changed:
drivers/message/fusion/mptscsih.c
drivers/scsi/aacraid/aachba.c
drivers/scsi/arm/acornscsi.c
drivers/scsi/ips.c
drivers/scsi/megaraid.c
drivers/scsi/megaraid/megaraid_mbox.c
drivers/target/target_core_device.c
drivers/target/target_core_pr.c
drivers/target/target_core_spc.c
drivers/usb/gadget/function/f_mass_storage.c
drivers/usb/storage/debug.c
include/scsi/scsi_proto.h
include/trace/events/scsi.h
include/trace/events/target.h