> On Sep 29, 2021, at 4:17 AM, Damien Le Moal <Damien.LeMoal@xxxxxxx> wrote:
>
> The modepage argument is unused. Remove it.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@xxxxxxx>
> ---
> drivers/scsi/scsi_lib.c | 8 +++-----
> drivers/scsi/sd.c | 2 +-
> include/scsi/scsi_device.h | 5 ++---
> 3 files changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
> index dcf105287a76..f1fe5803d7ec 100644
> --- a/drivers/scsi/scsi_lib.c
> +++ b/drivers/scsi/scsi_lib.c
> @@ -2001,7 +2001,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
> @@ -2014,10 +2013,9 @@ void scsi_exit_queue(void)
> * status on error
> *
> */
> -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, struct scsi_sense_hdr *sshdr)
> +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)
> {
> unsigned char cmd[10];
> unsigned char *real_buffer;
> diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
> index 71fa70b42c2b..89b5eea0ea0c 100644
> --- a/drivers/scsi/sd.c
> +++ b/drivers/scsi/sd.c
> @@ -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);
> diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
> index 09a17f6e93a7..1a9d2fe6aa02 100644
> --- a/include/scsi/scsi_device.h
> +++ b/include/scsi/scsi_device.h
> @@ -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);
> --
> 2.31.1
>
Looks Good.
Reviewed-by: Himanshu Madhani <himanshu.madhani@xxxxxxxxxx>
--
Himanshu Madhani Oracle Linux Engineering
