diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-05 11:56:35 -0700 |
| commit | 672a9c106966f8d418478830975288b8096bb058 (patch) | |
| tree | e47259d8a96084affaab87b0104b56ac352dc0eb /drivers/scsi | |
| parent | e8403b493fd5180e351ca67eb66406d95dadcd0b (diff) | |
| parent | 75a24b822d383489badd343cab4cb171d09f93ef (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
kfifo: fix inaccurate comment
tools/thermal: tmon: fix for segfault
net: Spelling s/stucture/structure/
edd: don't spam log if no EDD information is present
Documentation: Fix early-microcode.txt references after file rename
tracing: Block comments should align the * on each line
treewide: Fix typos in printk
GenWQE: Fix a typo in two comments
treewide: Align function definition open/close braces
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/aacraid/src.c | 4 | ||||
| -rw-r--r-- | drivers/scsi/dpt_i2o.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/qedi/qedi_fw.c | 2 | ||||
| -rw-r--r-- | drivers/scsi/sym53c8xx_2/sym_glue.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/src.c b/drivers/scsi/aacraid/src.c index fde6b6aa86e3..a802bddf04aa 100644 --- a/drivers/scsi/aacraid/src.c +++ b/drivers/scsi/aacraid/src.c @@ -786,7 +786,7 @@ static int aac_src_restart_adapter(struct aac_dev *dev, int bled, u8 reset_type) if (!is_ctrl_up) dev_err(&dev->pdev->dev, "IOP reset failed\n"); else { - dev_info(&dev->pdev->dev, "IOP reset succeded\n"); + dev_info(&dev->pdev->dev, "IOP reset succeeded\n"); goto set_startup; } } @@ -808,7 +808,7 @@ static int aac_src_restart_adapter(struct aac_dev *dev, int bled, u8 reset_type) ret = -ENODEV; goto out; } else - dev_info(&dev->pdev->dev, "SOFT reset succeded\n"); + dev_info(&dev->pdev->dev, "SOFT reset succeeded\n"); } set_startup: diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index fd172b0890d3..a00d822e3142 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c @@ -3524,7 +3524,7 @@ static int adpt_i2o_systab_send(adpt_hba* pHba) #endif return ret; - } +} /*============================================================================ diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c index d09afe1b567d..25d763ae5d5a 100644 --- a/drivers/scsi/qedi/qedi_fw.c +++ b/drivers/scsi/qedi/qedi_fw.c @@ -1882,7 +1882,7 @@ static int qedi_map_scsi_sg(struct qedi_ctx *qedi, struct qedi_cmd *cmd) bd[bd_count].sge_len = (u16)sg_len; QEDI_INFO(&qedi->dbg_ctx, QEDI_LOG_IO, - "single-cashed-sgl: bd_count:%d addr=%llx, len=%x", + "single-cached-sgl: bd_count:%d addr=%llx, len=%x", sg_count, addr, sg_len); return ++bd_count; diff --git a/drivers/scsi/sym53c8xx_2/sym_glue.c b/drivers/scsi/sym53c8xx_2/sym_glue.c index 791a2182de53..7320d5fe4cbc 100644 --- a/drivers/scsi/sym53c8xx_2/sym_glue.c +++ b/drivers/scsi/sym53c8xx_2/sym_glue.c @@ -1393,7 +1393,7 @@ static struct Scsi_Host *sym_attach(struct scsi_host_template *tpnt, int unit, scsi_host_put(shost); return NULL; - } +} /* |