| Message ID | 4e853f171366e040818346def7fb043347670662.1551995342.git.fthain@telegraphics.com.au (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | df135e32d72cc4d4af54ff748d6a2af78e38d331 |
| Headers | show |
| Series | scsi/NCR5380: Avoid compiler warning when -Wimplicit-fallthrough is enabled | expand |
Finn,
> Adjust comments accordingly.
Applied to 5.2/scsi-queue.
Hi all, Friendly ping: Who can take this? Thanks On 3/7/19 3:49 PM, Finn Thain wrote: > Adjust comments accordingly. > > Cc: Gustavo A. R. Silva <gustavo@embeddedor.com> > Cc: Michael Schmitz <schmitzmic@gmail.com> > Signed-off-by: Finn Thain <fthain@telegraphics.com.au> > --- > drivers/scsi/NCR5380.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c > index 7fed9bb72784..fe0535affc14 100644 > --- a/drivers/scsi/NCR5380.c > +++ b/drivers/scsi/NCR5380.c > @@ -1932,13 +1932,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) > if (!hostdata->connected) > return; > > - /* Fall through to reject message */ > - > + /* Reject message */ > + /* Fall through */ > + default: > /* > * If we get something weird that we aren't expecting, > - * reject it. > + * log it. > */ > - default: > if (tmp == EXTENDED_MESSAGE) > scmd_printk(KERN_INFO, cmd, > "rejecting unknown extended message code %02x, length %d\n", >
On Mon, 8 Apr 2019, Gustavo A. R. Silva wrote: > Hi all, > > Friendly ping: > > Who can take this? > > Thanks > It has been queued up by Martin and James on git.kernel.org. Apparently it is to be pushed in the v5.2 merge window. --
On 4/8/19 7:22 PM, Finn Thain wrote: > > It has been queued up by Martin and James on git.kernel.org. Apparently it > is to be pushed in the v5.2 merge window. > Awesome. Thanks -- Gustavo
diff --git a/drivers/scsi/NCR5380.c b/drivers/scsi/NCR5380.c index 7fed9bb72784..fe0535affc14 100644 --- a/drivers/scsi/NCR5380.c +++ b/drivers/scsi/NCR5380.c @@ -1932,13 +1932,13 @@ static void NCR5380_information_transfer(struct Scsi_Host *instance) if (!hostdata->connected) return; - /* Fall through to reject message */ - + /* Reject message */ + /* Fall through */ + default: /* * If we get something weird that we aren't expecting, - * reject it. + * log it. */ - default: if (tmp == EXTENDED_MESSAGE) scmd_printk(KERN_INFO, cmd, "rejecting unknown extended message code %02x, length %d\n",
Adjust comments accordingly. Cc: Gustavo A. R. Silva <gustavo@embeddedor.com> Cc: Michael Schmitz <schmitzmic@gmail.com> Signed-off-by: Finn Thain <fthain@telegraphics.com.au> --- drivers/scsi/NCR5380.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)