diff options
| author | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2023-08-30 16:06:38 -0700 | 
| commit | 1ac731c529cd4d6adbce134754b51ff7d822b145 (patch) | |
| tree | 143ab3f35ca5f3b69f583c84e6964b17139c2ec1 /drivers/scsi/stex.c | |
| parent | 07b4c950f27bef0362dc6ad7ee713aab61d58149 (diff) | |
| parent | 54116d442e001e1b6bd482122043b1870998a1f3 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.6 merge window.
Diffstat (limited to 'drivers/scsi/stex.c')
| -rw-r--r-- | drivers/scsi/stex.c | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 8def242675ef..8ffb75be99bc 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c @@ -109,7 +109,9 @@ enum {  	TASK_ATTRIBUTE_HEADOFQUEUE		= 0x1,  	TASK_ATTRIBUTE_ORDERED			= 0x2,  	TASK_ATTRIBUTE_ACA			= 0x4, +}; +enum {  	SS_STS_NORMAL				= 0x80000000,  	SS_STS_DONE				= 0x40000000,  	SS_STS_HANDSHAKE			= 0x20000000, @@ -121,7 +123,9 @@ enum {  	SS_I2H_REQUEST_RESET			= 0x2000,  	SS_MU_OPERATIONAL			= 0x80000000, +}; +enum {  	STEX_CDB_LENGTH				= 16,  	STATUS_VAR_LEN				= 128, @@ -1472,7 +1476,7 @@ static int stex_biosparam(struct scsi_device *sdev,  	return 0;  } -static struct scsi_host_template driver_template = { +static const struct scsi_host_template driver_template = {  	.module				= THIS_MODULE,  	.name				= DRV_NAME,  	.proc_name			= DRV_NAME,  |