| Message ID | 20220901005554.417043-1-zhangxuezhi3@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] scsi: csiostor: convert sysfs snprintf to sysfs_emit | expand |
On 9/1/22 09:55, Xuezhi Zhang wrote: > From: Xuezhi Zhang <zhangxuezhi1@coolpad.com> > > Fix up all sysfs show entries to use sysfs_emit > > Signed-off-by: Xuezhi Zhang <zhangxuezhi1@coolpad.com> > --- > v2: delete 'else' and extra space. > --- > arch/arm64/configs/defconfig | 2 ++ > drivers/scsi/csiostor/csio_scsi.c | 10 +++++----- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig > index 91e58cf59c99..6a0af8a5a8b2 100644 > --- a/arch/arm64/configs/defconfig > +++ b/arch/arm64/configs/defconfig > @@ -1328,3 +1328,5 @@ CONFIG_DEBUG_FS=y > # CONFIG_DEBUG_PREEMPT is not set > # CONFIG_FTRACE is not set > CONFIG_MEMTEST=y > +CONFIG_SCSI_CHELSIO_FCOE=y > +CONFIG_MEGARAID_MAILBOX=y This hunk is new in the patch and not explained in the commit message. This likely needs to be a different patch if this is a valid change. > diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c > index 9aafe0002ab1..05e1a63e00c3 100644 > --- a/drivers/scsi/csiostor/csio_scsi.c > +++ b/drivers/scsi/csiostor/csio_scsi.c > @@ -1366,9 +1366,9 @@ csio_show_hw_state(struct device *dev, > struct csio_hw *hw = csio_lnode_to_hw(ln); > > if (csio_is_hw_ready(hw)) > - return snprintf(buf, PAGE_SIZE, "ready\n"); > - else > - return snprintf(buf, PAGE_SIZE, "not ready\n"); > + return sysfs_emit(buf, "ready\n"); > + > + return sysfs_emit(buf, "not ready\n"); > } > > /* Device reset */ > @@ -1430,7 +1430,7 @@ csio_show_dbg_level(struct device *dev, > { > struct csio_lnode *ln = shost_priv(class_to_shost(dev)); > > - return snprintf(buf, PAGE_SIZE, "%x\n", ln->params.log_level); > + return sysfs_emit(buf, "%x\n", ln->params.log_level); > } > > /* Store debug level */ > @@ -1476,7 +1476,7 @@ csio_show_num_reg_rnodes(struct device *dev, > { > struct csio_lnode *ln = shost_priv(class_to_shost(dev)); > > - return snprintf(buf, PAGE_SIZE, "%d\n", ln->num_reg_rnodes); > + return sysfs_emit(buf, "%d\n", ln->num_reg_rnodes); > } > > static DEVICE_ATTR(num_reg_rnodes, S_IRUGO, csio_show_num_reg_rnodes, NULL); This part looks OK.
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 91e58cf59c99..6a0af8a5a8b2 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -1328,3 +1328,5 @@ CONFIG_DEBUG_FS=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y +CONFIG_SCSI_CHELSIO_FCOE=y +CONFIG_MEGARAID_MAILBOX=y diff --git a/drivers/scsi/csiostor/csio_scsi.c b/drivers/scsi/csiostor/csio_scsi.c index 9aafe0002ab1..05e1a63e00c3 100644 --- a/drivers/scsi/csiostor/csio_scsi.c +++ b/drivers/scsi/csiostor/csio_scsi.c @@ -1366,9 +1366,9 @@ csio_show_hw_state(struct device *dev, struct csio_hw *hw = csio_lnode_to_hw(ln); if (csio_is_hw_ready(hw)) - return snprintf(buf, PAGE_SIZE, "ready\n"); - else - return snprintf(buf, PAGE_SIZE, "not ready\n"); + return sysfs_emit(buf, "ready\n"); + + return sysfs_emit(buf, "not ready\n"); } /* Device reset */ @@ -1430,7 +1430,7 @@ csio_show_dbg_level(struct device *dev, { struct csio_lnode *ln = shost_priv(class_to_shost(dev)); - return snprintf(buf, PAGE_SIZE, "%x\n", ln->params.log_level); + return sysfs_emit(buf, "%x\n", ln->params.log_level); } /* Store debug level */ @@ -1476,7 +1476,7 @@ csio_show_num_reg_rnodes(struct device *dev, { struct csio_lnode *ln = shost_priv(class_to_shost(dev)); - return snprintf(buf, PAGE_SIZE, "%d\n", ln->num_reg_rnodes); + return sysfs_emit(buf, "%d\n", ln->num_reg_rnodes); } static DEVICE_ATTR(num_reg_rnodes, S_IRUGO, csio_show_num_reg_rnodes, NULL);