| Message ID | 20240305122452.340471-7-john.g.garry@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Add LIBSAS_SHT_BASE for libsas | expand |
On 2024/3/5 20:24, John Garry wrote: > Use standard template for scsi_host_template structure to reduce > duplication. > > Signed-off-by: John Garry <john.g.garry@oracle.com> > --- > drivers/scsi/isci/init.c | 22 +--------------------- > 1 file changed, 1 insertion(+), 21 deletions(-) > > diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c > index d0a23ce4afba..49e64232def1 100644 > --- a/drivers/scsi/isci/init.c > +++ b/drivers/scsi/isci/init.c > @@ -155,31 +155,11 @@ static const struct attribute_group *isci_sdev_groups[] = { > }; > > static const struct scsi_host_template isci_sht = { > - > - .module = THIS_MODULE, > - .name = DRV_NAME, > - .proc_name = DRV_NAME, > - .queuecommand = sas_queuecommand, > - .dma_need_drain = ata_scsi_dma_need_drain, > - .target_alloc = sas_target_alloc, > - .slave_configure = sas_slave_configure, > + LIBSAS_SHT_BASE > .scan_finished = isci_host_scan_finished, > .scan_start = isci_host_start, > - .change_queue_depth = sas_change_queue_depth, > - .bios_param = sas_bios_param, > .can_queue = ISCI_CAN_QUEUE_VAL, > - .this_id = -1, > .sg_tablesize = SG_ALL, > - .max_sectors = SCSI_DEFAULT_MAX_SECTORS, .max_sectors is not defined in LIBSAS_SHT_BASE. Thanks, Jaosn > - .eh_abort_handler = sas_eh_abort_handler, > - .eh_device_reset_handler = sas_eh_device_reset_handler, > - .eh_target_reset_handler = sas_eh_target_reset_handler, > - .slave_alloc = sas_slave_alloc, > - .target_destroy = sas_target_destroy, > - .ioctl = sas_ioctl, > -#ifdef CONFIG_COMPAT > - .compat_ioctl = sas_ioctl, > -#endif > .shost_groups = isci_host_groups, > .sdev_groups = isci_sdev_groups, > .track_queue_depth = 1, >
On 05/03/2024 13:21, Jason Yan wrote: >> .sg_tablesize = SG_ALL, >> - .max_sectors = SCSI_DEFAULT_MAX_SECTORS, > > .max_sectors is not defined in LIBSAS_SHT_BASE. Sure, but when not set, scsi_host_alloc() will default to SCSI_DEFAULT_MAX_SECTORS automatically Thanks, John
On 2024/3/5 21:27, John Garry wrote: > On 05/03/2024 13:21, Jason Yan wrote: >>> .sg_tablesize = SG_ALL, >>> - .max_sectors = SCSI_DEFAULT_MAX_SECTORS, >> >> .max_sectors is not defined in LIBSAS_SHT_BASE. > > Sure, but when not set, scsi_host_alloc() will default to > SCSI_DEFAULT_MAX_SECTORS automatically OK, so it's fine to let it uninitialized. Reviewed-by: Jason Yan <yanaijie@huawei.com> > > Thanks, > John > .
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index d0a23ce4afba..49e64232def1 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -155,31 +155,11 @@ static const struct attribute_group *isci_sdev_groups[] = { }; static const struct scsi_host_template isci_sht = { - - .module = THIS_MODULE, - .name = DRV_NAME, - .proc_name = DRV_NAME, - .queuecommand = sas_queuecommand, - .dma_need_drain = ata_scsi_dma_need_drain, - .target_alloc = sas_target_alloc, - .slave_configure = sas_slave_configure, + LIBSAS_SHT_BASE .scan_finished = isci_host_scan_finished, .scan_start = isci_host_start, - .change_queue_depth = sas_change_queue_depth, - .bios_param = sas_bios_param, .can_queue = ISCI_CAN_QUEUE_VAL, - .this_id = -1, .sg_tablesize = SG_ALL, - .max_sectors = SCSI_DEFAULT_MAX_SECTORS, - .eh_abort_handler = sas_eh_abort_handler, - .eh_device_reset_handler = sas_eh_device_reset_handler, - .eh_target_reset_handler = sas_eh_target_reset_handler, - .slave_alloc = sas_slave_alloc, - .target_destroy = sas_target_destroy, - .ioctl = sas_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = sas_ioctl, -#endif .shost_groups = isci_host_groups, .sdev_groups = isci_sdev_groups, .track_queue_depth = 1,
Use standard template for scsi_host_template structure to reduce duplication. Signed-off-by: John Garry <john.g.garry@oracle.com> --- drivers/scsi/isci/init.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)