Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

scsi: core: Fix scsi_mode_select() interface

The modepage argument is unused. Remove it.

Link: https://lore.kernel.org/r/20210929091744.706003-3-damien.lemoal@wdc.com
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Damien Le Moal and committed by
Martin K. Petersen
81d3f500 4d516e49

+6 -9
+3 -5
drivers/scsi/scsi_lib.c
··· 2026 2026 * @sdev: SCSI device to be queried 2027 2027 * @pf: Page format bit (1 == standard, 0 == vendor specific) 2028 2028 * @sp: Save page bit (0 == don't save, 1 == save) 2029 - * @modepage: mode page being requested 2030 2029 * @buffer: request buffer (may not be smaller than eight bytes) 2031 2030 * @len: length of request buffer. 2032 2031 * @timeout: command timeout ··· 2038 2039 * status on error 2039 2040 * 2040 2041 */ 2041 - int 2042 - scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage, 2043 - unsigned char *buffer, int len, int timeout, int retries, 2044 - struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr) 2042 + int scsi_mode_select(struct scsi_device *sdev, int pf, int sp, 2043 + unsigned char *buffer, int len, int timeout, int retries, 2044 + struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr) 2045 2045 { 2046 2046 unsigned char cmd[10]; 2047 2047 unsigned char *real_buffer;
+1 -1
drivers/scsi/sd.c
··· 209 209 */ 210 210 data.device_specific = 0; 211 211 212 - if (scsi_mode_select(sdp, 1, sp, 8, buffer_data, len, SD_TIMEOUT, 212 + if (scsi_mode_select(sdp, 1, sp, buffer_data, len, SD_TIMEOUT, 213 213 sdkp->max_retries, &data, &sshdr)) { 214 214 if (scsi_sense_valid(&sshdr)) 215 215 sd_print_sense_hdr(sdkp, &sshdr);
+2 -3
include/scsi/scsi_device.h
··· 415 415 int retries, struct scsi_mode_data *data, 416 416 struct scsi_sense_hdr *); 417 417 extern int scsi_mode_select(struct scsi_device *sdev, int pf, int sp, 418 - int modepage, unsigned char *buffer, int len, 419 - int timeout, int retries, 420 - struct scsi_mode_data *data, 418 + unsigned char *buffer, int len, int timeout, 419 + int retries, struct scsi_mode_data *data, 421 420 struct scsi_sense_hdr *); 422 421 extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout, 423 422 int retries, struct scsi_sense_hdr *sshdr);