scsi: hptiop: Switch to using ->device_configure
authorChristoph Hellwig <hch@lst.de>
Tue, 9 Apr 2024 14:37:39 +0000 (16:37 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 12 Apr 2024 01:37:49 +0000 (21:37 -0400)
Switch to the ->device_configure method instead of ->slave_configure and
update the block limits on the passed in queue_limits instead of using the
per-limit accessors.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20240409143748.980206-15-hch@lst.de
Reviewed-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/hptiop.c

index f5334ccbf2cac3f1eec7cfa9b3db1ba995d4968a..e889f268601b4f7e43096b8fe5b1f6284ec2a476 100644 (file)
@@ -1151,11 +1151,11 @@ static struct attribute *hptiop_host_attrs[] = {
 
 ATTRIBUTE_GROUPS(hptiop_host);
 
-static int hptiop_slave_config(struct scsi_device *sdev)
+static int hptiop_device_configure(struct scsi_device *sdev,
+               struct queue_limits *lim)
 {
        if (sdev->type == TYPE_TAPE)
-               blk_queue_max_hw_sectors(sdev->request_queue, 8192);
-
+               lim->max_hw_sectors = 8192;
        return 0;
 }
 
@@ -1168,7 +1168,7 @@ static const struct scsi_host_template driver_template = {
        .emulated                   = 0,
        .proc_name                  = driver_name,
        .shost_groups               = hptiop_host_groups,
-       .slave_configure            = hptiop_slave_config,
+       .device_configure           = hptiop_device_configure,
        .this_id                    = -1,
        .change_queue_depth         = hptiop_adjust_disk_queue_depth,
        .cmd_size                   = sizeof(struct hpt_cmd_priv),