Commit 81d3f500 authored by Damien Le Moal's avatar Damien Le Moal Committed by Martin K. Petersen
Browse files

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: default avatarHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: default avatarDamien Le Moal <damien.lemoal@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 4d516e49

drivers/scsi/scsi_lib.c

+3 −5
Original line number Diff line number Diff line
@@ -2026,7 +2026,6 @@ void scsi_exit_queue(void) 
 *	@sdev:	SCSI device to be queried

 *	@pf:	Page format bit (1 == standard, 0 == vendor specific)

 *	@sp:	Save page bit (0 == don't save, 1 == save)

 *	@modepage: mode page being requested

 *	@buffer: request buffer (may not be smaller than eight bytes)

 *	@len:	length of request buffer.

 *	@timeout: command timeout
@@ -2039,8 +2038,7 @@ void scsi_exit_queue(void) 
 *	status on error

 *

 */

int

scsi_mode_select(struct scsi_device *sdev, int pf, int sp, int modepage,

int scsi_mode_select(struct scsi_device *sdev, int pf, int sp,

		     unsigned char *buffer, int len, int timeout, int retries,

		     struct scsi_mode_data *data, struct scsi_sense_hdr *sshdr)

{

drivers/scsi/sd.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ cache_type_store(struct device *dev, struct device_attribute *attr, 
	 */

	data.device_specific = 0;



	if (scsi_mode_select(sdp, 1, sp, 8, buffer_data, len, SD_TIMEOUT,

	if (scsi_mode_select(sdp, 1, sp, buffer_data, len, SD_TIMEOUT,

			     sdkp->max_retries, &data, &sshdr)) {

		if (scsi_sense_valid(&sshdr))

			sd_print_sense_hdr(sdkp, &sshdr);

include/scsi/scsi_device.h

+2 −3
Original line number Diff line number Diff line
@@ -415,9 +415,8 @@ extern int scsi_mode_sense(struct scsi_device *sdev, int dbd, int modepage, 
			   int retries, struct scsi_mode_data *data,

			   struct scsi_sense_hdr *);

extern int scsi_mode_select(struct scsi_device *sdev, int pf, int sp,

			    int modepage, unsigned char *buffer, int len,

			    int timeout, int retries,

			    struct scsi_mode_data *data,

			    unsigned char *buffer, int len, int timeout,

			    int retries, struct scsi_mode_data *data,

			    struct scsi_sense_hdr *);

extern int scsi_test_unit_ready(struct scsi_device *sdev, int timeout,

				int retries, struct scsi_sense_hdr *sshdr);