| Message ID | 20230309192614.2240602-52-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Constify most SCSI host templates | expand |
On Thu, 9 Mar 2023, Bart Van Assche wrote: > Make it explicit that the SCSI host template is not modified. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > drivers/scsi/mac_scsi.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c > index 2e511697fce3..1d13f1ebc094 100644 > --- a/drivers/scsi/mac_scsi.c > +++ b/drivers/scsi/mac_scsi.c > @@ -422,7 +422,7 @@ static int macscsi_dma_residual(struct NCR5380_hostdata *hostdata) > #define DRV_MODULE_NAME "mac_scsi" > #define PFX DRV_MODULE_NAME ": " > > -static struct scsi_host_template mac_scsi_template = { > +struct scsi_host_template mac_scsi_template = { > .module = THIS_MODULE, > .proc_name = DRV_MODULE_NAME, > .name = "Macintosh NCR5380 SCSI", > I think something went wrong there. No change is needed for mac_scsi_template as it can't be made const.
Hi Bart, Am 10.03.2023 um 17:46 schrieb Finn Thain: > On Thu, 9 Mar 2023, Bart Van Assche wrote: > >> Make it explicit that the SCSI host template is not modified. >> >> Signed-off-by: Bart Van Assche <bvanassche@acm.org> >> --- >> drivers/scsi/mac_scsi.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c >> index 2e511697fce3..1d13f1ebc094 100644 >> --- a/drivers/scsi/mac_scsi.c >> +++ b/drivers/scsi/mac_scsi.c >> @@ -422,7 +422,7 @@ static int macscsi_dma_residual(struct NCR5380_hostdata *hostdata) >> #define DRV_MODULE_NAME "mac_scsi" >> #define PFX DRV_MODULE_NAME ": " >> >> -static struct scsi_host_template mac_scsi_template = { >> +struct scsi_host_template mac_scsi_template = { >> .module = THIS_MODULE, >> .proc_name = DRV_MODULE_NAME, >> .name = "Macintosh NCR5380 SCSI", >> > > I think something went wrong there. No change is needed for > mac_scsi_template as it can't be made const. I concur - and hope there wasn't a similar patch to atari_scsi.c (that one's host template is also modified during probe). Cheers, Michael
On 3/9/23 22:09, Michael Schmitz wrote: > Hi Bart, > > Am 10.03.2023 um 17:46 schrieb Finn Thain: >> On Thu, 9 Mar 2023, Bart Van Assche wrote: >> >>> Make it explicit that the SCSI host template is not modified. >>> >>> Signed-off-by: Bart Van Assche <bvanassche@acm.org> >>> --- >>> drivers/scsi/mac_scsi.c | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c >>> index 2e511697fce3..1d13f1ebc094 100644 >>> --- a/drivers/scsi/mac_scsi.c >>> +++ b/drivers/scsi/mac_scsi.c >>> @@ -422,7 +422,7 @@ static int macscsi_dma_residual(struct >>> NCR5380_hostdata *hostdata) >>> #define DRV_MODULE_NAME "mac_scsi" >>> #define PFX DRV_MODULE_NAME ": " >>> >>> -static struct scsi_host_template mac_scsi_template = { >>> +struct scsi_host_template mac_scsi_template = { >>> .module = THIS_MODULE, >>> .proc_name = DRV_MODULE_NAME, >>> .name = "Macintosh NCR5380 SCSI", >>> >> >> I think something went wrong there. No change is needed for >> mac_scsi_template as it can't be made const. > > I concur - and hope there wasn't a similar patch to atari_scsi.c (that > one's host template is also modified during probe). This patch series does not modify the drivers/scsi/atari_scsi.c source file. I will drop this patch. Thanks, Bart.
diff --git a/drivers/scsi/mac_scsi.c b/drivers/scsi/mac_scsi.c index 2e511697fce3..1d13f1ebc094 100644 --- a/drivers/scsi/mac_scsi.c +++ b/drivers/scsi/mac_scsi.c @@ -422,7 +422,7 @@ static int macscsi_dma_residual(struct NCR5380_hostdata *hostdata) #define DRV_MODULE_NAME "mac_scsi" #define PFX DRV_MODULE_NAME ": " -static struct scsi_host_template mac_scsi_template = { +struct scsi_host_template mac_scsi_template = { .module = THIS_MODULE, .proc_name = DRV_MODULE_NAME, .name = "Macintosh NCR5380 SCSI",
Make it explicit that the SCSI host template is not modified. Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/scsi/mac_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)