| Message ID | 20221213150942.988371-1-yanaijie@huawei.com |
|---|---|
| Headers | show |
| Series | scsi: libsas: Some coding style fixes and cleanups | expand |
On 13/12/2022 15:09, Jason Yan wrote: > There is a sas_get_ata_command_set() declaration above sas_get_ata_info() > to make it compile ok. However this function is defined in the same file > below. So move it up to save the declaration. nit: forward declaration > > Also remove the variable 'fis' which is not needed in this function. > > Cc: John Garry<john.g.garry@oracle.com> > Signed-off-by: Jason Yan<yanaijie@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com>
On 13/12/2022 15:09, Jason Yan wrote: > The coding style where calling this interface is inconsistent with other > interfaces for sata devices. The standard style for other sata interfaces nit: capitalize acronyms, so /s/sata/SATA/ > is like: > > #ifdefine CONFIG_SCSI_SAS_ATA > void sas_ata_task_abort(struct sas_task *task); > #else > static inline void sas_ata_task_abort(struct sas_task *task) > { > } > #endif > > And the callers does not have to do things like "#ifdefine CONFIG_SCSI_SAS_ATA" > and may call the interface directly. So follow the standard style here. > > Cc: John Garry <john.g.garry@oracle.com> > Signed-off-by: Jason Yan <yanaijie@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com> > --- > drivers/scsi/libsas/sas_discover.c | 6 ------ > include/scsi/libsas.h | 1 - > include/scsi/sas_ata.h | 6 ++++++ > 3 files changed, 6 insertions(+), 7 deletions(-) > > diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c > index d5bc1314c341..72fdb2e5d047 100644 > --- a/drivers/scsi/libsas/sas_discover.c > +++ b/drivers/scsi/libsas/sas_discover.c > @@ -455,14 +455,8 @@ static void sas_discover_domain(struct work_struct *work) > break; > case SAS_SATA_DEV: > case SAS_SATA_PM: > -#ifdef CONFIG_SCSI_SAS_ATA > error = sas_discover_sata(dev); > break; > -#else > - pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n"); > - fallthrough; > -#endif > - /* Fall through - only for the #else condition above. */ > default: > error = -ENXIO; > pr_err("unhandled device %d\n", dev->dev_type); > diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h > index 1aee3d0ebbb2..159823e0afbf 100644 > --- a/include/scsi/libsas.h > +++ b/include/scsi/libsas.h > @@ -735,7 +735,6 @@ void sas_unregister_domain_devices(struct asd_sas_port *port, int gone); > void sas_init_disc(struct sas_discovery *disc, struct asd_sas_port *); > void sas_discover_event(struct asd_sas_port *, enum discover_event ev); > > -int sas_discover_sata(struct domain_device *); > int sas_discover_end_dev(struct domain_device *); > > void sas_unregister_dev(struct asd_sas_port *port, struct domain_device *); > diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h > index 9c927d46f136..2fd15f194316 100644 > --- a/include/scsi/sas_ata.h > +++ b/include/scsi/sas_ata.h > @@ -36,6 +36,7 @@ void sas_ata_device_link_abort(struct domain_device *dev, bool force_reset); > int sas_execute_ata_cmd(struct domain_device *device, u8 *fis, > int force_phy_id); > int smp_ata_check_ready_type(struct ata_link *link); > +int sas_discover_sata(struct domain_device *dev); > #else > > > @@ -103,6 +104,11 @@ static inline int smp_ata_check_ready_type(struct ata_link *link) > { > return 0; > } nit: is there a blank line missing? > +static inline int sas_discover_sata(struct domain_device *dev) > +{ > + pr_notice("ATA device seen but CONFIG_SCSI_SAS_ATA=N so cannot attach\n"); > + return -ENXIO; > +} > #endif > > #endif /* _SAS_ATA_H_ */
On 13/12/2022 15:09, Jason Yan wrote: > A few coding style fixes and cleanups. There should be no functional > changes in this series besides the debug log prints. > > v1->v2: > 1. Drop patch #2 in v1. > 2. Other misc changes suggested by John. Note: it would be better to concisely mention the actual changes, so that we know what to look for in the new version. Just writing something like "incorporate changes suggested by <insert name>" is unfortunately not much use. Thanks, John > > Jason Yan (5): > scsi: libsas: move sas_get_ata_command_set() up to save the > declaration > scsi: libsas: change the coding style of sas_discover_sata() > scsi: libsas: remove useless dev_list delete in > sas_ex_discover_end_dev() > scsi: libsas: factor out sas_ata_add_dev() > scsi: libsas: factor out sas_ex_add_dev() > > drivers/scsi/libsas/sas_ata.c | 88 ++++++++++++++++---- > drivers/scsi/libsas/sas_discover.c | 6 -- > drivers/scsi/libsas/sas_expander.c | 125 ++++++++++------------------- > include/scsi/libsas.h | 1 - > include/scsi/sas_ata.h | 15 ++++ > 5 files changed, 129 insertions(+), 106 deletions(-) >
On 13/12/2022 15:09, Jason Yan wrote: > Factor out sas_ex_add_dev() to be consistent with sas_ata_add_dev() and > unify the error handling. > > Cc: John Garry<john.g.garry@oracle.com> > Signed-off-by: Jason Yan<yanaijie@huawei.com> Reviewed-by: John Garry <john.g.garry@oracle.com>
On 2022/12/14 0:12, John Garry wrote: > On 13/12/2022 15:09, Jason Yan wrote: >> A few coding style fixes and cleanups. There should be no functional >> changes in this series besides the debug log prints. >> >> v1->v2: >> 1. Drop patch #2 in v1. >> 2. Other misc changes suggested by John. > > Note: it would be better to concisely mention the actual changes, so > that we know what to look for in the new version. Just writing something > like "incorporate changes suggested by <insert name>" is unfortunately > not much use. > Yeah, my bad. Thank you for your patience, John.
A few coding style fixes and cleanups. There should be no functional changes in this series besides the debug log prints. v1->v2: 1. Drop patch #2 in v1. 2. Other misc changes suggested by John. Jason Yan (5): scsi: libsas: move sas_get_ata_command_set() up to save the declaration scsi: libsas: change the coding style of sas_discover_sata() scsi: libsas: remove useless dev_list delete in sas_ex_discover_end_dev() scsi: libsas: factor out sas_ata_add_dev() scsi: libsas: factor out sas_ex_add_dev() drivers/scsi/libsas/sas_ata.c | 88 ++++++++++++++++---- drivers/scsi/libsas/sas_discover.c | 6 -- drivers/scsi/libsas/sas_expander.c | 125 ++++++++++------------------- include/scsi/libsas.h | 1 - include/scsi/sas_ata.h | 15 ++++ 5 files changed, 129 insertions(+), 106 deletions(-)