| Message ID | 20160120194141.23159.5168.stgit@brunhilda (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
> On Jan 20, 2016, at 1:41 PM, Don Brace <don.brace@pmcs.com> wrote: > > The hpsa driver uses this function to cleanup inquiry > data. Our new pqi driver will also use this > function. This function was copied into both drivers. > > This patch exports sanitize_inquiry_string so the hpsa > and the pqi drivers can use this function directly. > > Hannes recommended the change in review: > https://www.marc.info/?l=linux-scsi&m=144619249003064&w=2 > that using the existing function in scsi_scan would be > preferrable. I also made this suggestion when reviewing the same patch: https://www.marc.info/?l=linux-scsi&m=144613827316617&w=2 Reviewed-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> > > Suggested-by: Hannes Reinecke <hare@suse.de> > Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com> > Reviewed-by: Justin Lindley <justin.lindley@pmcs.com> > Reviewed-by: Scott Teel <scott.teel@pmcs.com> > Reviewed-by: Hannes Reinecke <hare@suse.de> > Signed-off-by: Don Brace <don.brace@pmcs.com> > --- > drivers/scsi/scsi_scan.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index 6a82066..1f02e84 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -518,7 +518,8 @@ void scsi_target_reap(struct scsi_target *starget) > } > > /** > - * sanitize_inquiry_string - remove non-graphical chars from an INQUIRY result string > + * scsi_sanitize_inquiry_string - remove non-graphical chars from an > + * INQUIRY result string > * @s: INQUIRY result string to sanitize > * @len: length of the string > * > @@ -531,7 +532,7 @@ void scsi_target_reap(struct scsi_target *starget) > * string terminator, so all the following characters are set to > * spaces. > **/ > -static void sanitize_inquiry_string(unsigned char *s, int len) > +void scsi_sanitize_inquiry_string(unsigned char *s, int len) > { > int terminated = 0; > > @@ -542,6 +543,7 @@ static void sanitize_inquiry_string(unsigned char *s, int len) > *s = ' '; > } > } > +EXPORT_SYMBOL(scsi_sanitize_inquiry_string); > > /** > * scsi_probe_lun - probe a single LUN using a SCSI INQUIRY > @@ -627,9 +629,9 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, > } > > if (result == 0) { > - sanitize_inquiry_string(&inq_result[8], 8); > - sanitize_inquiry_string(&inq_result[16], 16); > - sanitize_inquiry_string(&inq_result[32], 4); > + scsi_sanitize_inquiry_string(&inq_result[8], 8); > + scsi_sanitize_inquiry_string(&inq_result[16], 16); > + scsi_sanitize_inquiry_string(&inq_result[32], 4); > > response_len = inq_result[4] + 5; > if (response_len > 255) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Jan 20, 2016 at 01:41:41PM -0600, Don Brace wrote: > The hpsa driver uses this function to cleanup inquiry > data. Our new pqi driver will also use this > function. This function was copied into both drivers. > > This patch exports sanitize_inquiry_string so the hpsa > and the pqi drivers can use this function directly. > > Hannes recommended the change in review: > https://www.marc.info/?l=linux-scsi&m=144619249003064&w=2 > that using the existing function in scsi_scan would be > preferrable. > > Suggested-by: Hannes Reinecke <hare@suse.de> > Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com> > Reviewed-by: Justin Lindley <justin.lindley@pmcs.com> > Reviewed-by: Scott Teel <scott.teel@pmcs.com> > Reviewed-by: Hannes Reinecke <hare@suse.de> > Signed-off-by: Don Brace <don.brace@pmcs.com> > --- > drivers/scsi/scsi_scan.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index 6a82066..1f02e84 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -518,7 +518,8 @@ void scsi_target_reap(struct scsi_target *starget) > } > > /** > - * sanitize_inquiry_string - remove non-graphical chars from an INQUIRY result string > + * scsi_sanitize_inquiry_string - remove non-graphical chars from an > + * INQUIRY result string > * @s: INQUIRY result string to sanitize > * @len: length of the string > * > @@ -531,7 +532,7 @@ void scsi_target_reap(struct scsi_target *starget) > * string terminator, so all the following characters are set to > * spaces. > **/ > -static void sanitize_inquiry_string(unsigned char *s, int len) > +void scsi_sanitize_inquiry_string(unsigned char *s, int len) > { > int terminated = 0; > > @@ -542,6 +543,7 @@ static void sanitize_inquiry_string(unsigned char *s, int len) > *s = ' '; > } > } > +EXPORT_SYMBOL(scsi_sanitize_inquiry_string); > > /** > * scsi_probe_lun - probe a single LUN using a SCSI INQUIRY > @@ -627,9 +629,9 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, > } > > if (result == 0) { > - sanitize_inquiry_string(&inq_result[8], 8); > - sanitize_inquiry_string(&inq_result[16], 16); > - sanitize_inquiry_string(&inq_result[32], 4); > + scsi_sanitize_inquiry_string(&inq_result[8], 8); > + scsi_sanitize_inquiry_string(&inq_result[16], 16); > + scsi_sanitize_inquiry_string(&inq_result[32], 4); > > response_len = inq_result[4] + 5; > if (response_len > 255) > > -- > To unsubscribe from this list: send the line "unsubscribe linux-scsi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
On 01/20/2016 01:41 PM, Don Brace wrote: > The hpsa driver uses this function to cleanup inquiry > data. Our new pqi driver will also use this > function. This function was copied into both drivers. > > This patch exports sanitize_inquiry_string so the hpsa > and the pqi drivers can use this function directly. > > Hannes recommended the change in review: > https://www.marc.info/?l=linux-scsi&m=144619249003064&w=2 > that using the existing function in scsi_scan would be > preferrable. > > Suggested-by: Hannes Reinecke <hare@suse.de> > Reviewed-by: Kevin Barnett <kevin.barnett@pmcs.com> > Reviewed-by: Justin Lindley <justin.lindley@pmcs.com> > Reviewed-by: Scott Teel <scott.teel@pmcs.com> > Reviewed-by: Hannes Reinecke <hare@suse.de> > Signed-off-by: Don Brace <don.brace@pmcs.com> > --- > drivers/scsi/scsi_scan.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c > index 6a82066..1f02e84 100644 > --- a/drivers/scsi/scsi_scan.c > +++ b/drivers/scsi/scsi_scan.c > @@ -518,7 +518,8 @@ void scsi_target_reap(struct scsi_target *starget) It was pointed out to me by Kevin Barnett that I should also add a prototype in scsi.h. Any thoughts for a V1 with this addition? -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>> "Don" == Don Brace <brace77070@gmail.com> writes:
Don> It was pointed out to me by Kevin Barnett that I should also add a
Don> prototype in scsi.h.
Yes, please.
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 6a82066..1f02e84 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c @@ -518,7 +518,8 @@ void scsi_target_reap(struct scsi_target *starget) } /** - * sanitize_inquiry_string - remove non-graphical chars from an INQUIRY result string + * scsi_sanitize_inquiry_string - remove non-graphical chars from an + * INQUIRY result string * @s: INQUIRY result string to sanitize * @len: length of the string * @@ -531,7 +532,7 @@ void scsi_target_reap(struct scsi_target *starget) * string terminator, so all the following characters are set to * spaces. **/ -static void sanitize_inquiry_string(unsigned char *s, int len) +void scsi_sanitize_inquiry_string(unsigned char *s, int len) { int terminated = 0; @@ -542,6 +543,7 @@ static void sanitize_inquiry_string(unsigned char *s, int len) *s = ' '; } } +EXPORT_SYMBOL(scsi_sanitize_inquiry_string); /** * scsi_probe_lun - probe a single LUN using a SCSI INQUIRY @@ -627,9 +629,9 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result, } if (result == 0) { - sanitize_inquiry_string(&inq_result[8], 8); - sanitize_inquiry_string(&inq_result[16], 16); - sanitize_inquiry_string(&inq_result[32], 4); + scsi_sanitize_inquiry_string(&inq_result[8], 8); + scsi_sanitize_inquiry_string(&inq_result[16], 16); + scsi_sanitize_inquiry_string(&inq_result[32], 4); response_len = inq_result[4] + 5; if (response_len > 255)