| Message ID | 20200418070605.11450-1-yanaijie@huawei.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | ec34143912667c0f34cd6e0667344dde5e725f13 |
| Headers | show |
| Series | scsi: st: remove unneeded variable 'result' in st_release() | expand |
> On 18. Apr 2020, at 10.06, Jason Yan <yanaijie@huawei.com> wrote: > > Also remove a strange '^L' after this function. > It is the FormFeed character, put there to make viewing the source easier (the following functions are helpers). (The FormFeed may not be as familiar to the younger generations than it is to us who have used line printers with hammers and drums or chains :-) > Fix the following coccicheck warning: > > drivers/scsi/st.c:1460:5-11: Unneeded variable: "result". Return "0" on > line 1473 > The variable is related to the style of programming: default the return value to zero and modify it in the code if necessary. In the current version, there is no need (may have been at some time). IMHO, the code checking tools should have some understanding of the style issues. However, if the common opinion is to remove the variable, I have to accept that. Kai > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Jason Yan <yanaijie@huawei.com> Acked-by: Kai Mäkisara <kai.makisara@kolumbus.fi> > --- > drivers/scsi/st.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c > index c5f9b348b438..4bf4ab3b70f4 100644 > --- a/drivers/scsi/st.c > +++ b/drivers/scsi/st.c > @@ -1457,7 +1457,6 @@ static int st_flush(struct file *filp, fl_owner_t id) > accessing this tape. */ > static int st_release(struct inode *inode, struct file *filp) > { > - int result = 0; > struct scsi_tape *STp = filp->private_data; > > if (STp->door_locked == ST_LOCKED_AUTO) > @@ -1470,9 +1469,9 @@ static int st_release(struct inode *inode, struct file *filp) > scsi_autopm_put_device(STp->device); > scsi_tape_put(STp); > > - return result; > + return 0; > } > - > + > /* The checks common to both reading and writing */ > static ssize_t rw_checks(struct scsi_tape *STp, struct file *filp, size_t count) > { > -- > 2.21.1 >
Jason, > Also remove a strange '^L' after this function. > > Fix the following coccicheck warning: > > drivers/scsi/st.c:1460:5-11: Unneeded variable: "result". Return "0" on > line 1473 Applied to 5.8/scsi-queue, thanks!
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index c5f9b348b438..4bf4ab3b70f4 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -1457,7 +1457,6 @@ static int st_flush(struct file *filp, fl_owner_t id) accessing this tape. */ static int st_release(struct inode *inode, struct file *filp) { - int result = 0; struct scsi_tape *STp = filp->private_data; if (STp->door_locked == ST_LOCKED_AUTO) @@ -1470,9 +1469,9 @@ static int st_release(struct inode *inode, struct file *filp) scsi_autopm_put_device(STp->device); scsi_tape_put(STp); - return result; + return 0; } - + /* The checks common to both reading and writing */ static ssize_t rw_checks(struct scsi_tape *STp, struct file *filp, size_t count) {
Also remove a strange '^L' after this function. Fix the following coccicheck warning: drivers/scsi/st.c:1460:5-11: Unneeded variable: "result". Return "0" on line 1473 Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Jason Yan <yanaijie@huawei.com> --- drivers/scsi/st.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)