diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
tree | dd9b0204d90b25e1e0be933348776f09434333c6 /drivers/scsi | |
parent | 05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff) | |
parent | c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index fd8ffe6bcfdd..0102a2d70dd8 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -1225,7 +1225,7 @@ struct bus_type iscsi_flashnode_bus = { | |||
1225 | * Adds a sysfs entry for the flashnode session attributes | 1225 | * Adds a sysfs entry for the flashnode session attributes |
1226 | * | 1226 | * |
1227 | * Returns: | 1227 | * Returns: |
1228 | * pointer to allocated flashnode sess on sucess | 1228 | * pointer to allocated flashnode sess on success |
1229 | * %NULL on failure | 1229 | * %NULL on failure |
1230 | */ | 1230 | */ |
1231 | struct iscsi_bus_flash_session * | 1231 | struct iscsi_bus_flash_session * |
@@ -1423,7 +1423,7 @@ static int iscsi_iter_destroy_flashnode_conn_fn(struct device *dev, void *data) | |||
1423 | } | 1423 | } |
1424 | 1424 | ||
1425 | /** | 1425 | /** |
1426 | * iscsi_destroy_flashnode_sess - destory flashnode session entry | 1426 | * iscsi_destroy_flashnode_sess - destroy flashnode session entry |
1427 | * @fnode_sess: pointer to flashnode session entry to be destroyed | 1427 | * @fnode_sess: pointer to flashnode session entry to be destroyed |
1428 | * | 1428 | * |
1429 | * Deletes the flashnode session entry and all children flashnode connection | 1429 | * Deletes the flashnode session entry and all children flashnode connection |
@@ -1453,7 +1453,7 @@ static int iscsi_iter_destroy_flashnode_fn(struct device *dev, void *data) | |||
1453 | } | 1453 | } |
1454 | 1454 | ||
1455 | /** | 1455 | /** |
1456 | * iscsi_destroy_all_flashnode - destory all flashnode session entries | 1456 | * iscsi_destroy_all_flashnode - destroy all flashnode session entries |
1457 | * @shost: pointer to host data | 1457 | * @shost: pointer to host data |
1458 | * | 1458 | * |
1459 | * Destroys all the flashnode session entries and all corresponding children | 1459 | * Destroys all the flashnode session entries and all corresponding children |