diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-06 12:36:28 -0400 |
| commit | 2e515bf096c245ba87f20ab4b4ea20f911afaeda (patch) | |
| tree | 8ce40f811092844ea9da683804db6e2afa410808 /Documentation/i2c | |
| parent | 22e04f6b4b04a8afe9af9239224591d06ba3b24d (diff) | |
| parent | f8ea61e63442c25cbe6ddee48979b444f1f2a01c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"The usual trivial updates all over the tree -- mostly typo fixes and
documentation updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
doc: Documentation/cputopology.txt fix typo
treewide: Convert retrun typos to return
Fix comment typo for init_cma_reserved_pageblock
Documentation/trace: Correcting and extending tracepoint documentation
mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
power: Documentation: Update s2ram link
doc: fix a typo in Documentation/00-INDEX
Documentation/printk-formats.txt: No casts needed for u64/s64
doc: Fix typo "is is" in Documentations
treewide: Fix printks with 0x%#
zram: doc fixes
Documentation/kmemcheck: update kmemcheck documentation
doc: documentation/hwspinlock.txt fix typo
PM / Hibernate: add section for resume options
doc: filesystems : Fix typo in Documentations/filesystems
scsi/megaraid fixed several typos in comments
ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
page_isolation: Fix a comment typo in test_pages_isolated()
doc: fix a typo about irq affinity
...
Diffstat (limited to 'Documentation/i2c')
| -rw-r--r-- | Documentation/i2c/upgrading-clients | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/i2c/upgrading-clients b/Documentation/i2c/upgrading-clients index d6991625c407..8e5fbd88c7d1 100644 --- a/Documentation/i2c/upgrading-clients +++ b/Documentation/i2c/upgrading-clients | |||
| @@ -196,8 +196,8 @@ static int example_probe(struct i2c_client *i2c_client, | |||
| 196 | 196 | ||
| 197 | Update the detach method, by changing the name to _remove and | 197 | Update the detach method, by changing the name to _remove and |
| 198 | to delete the i2c_detach_client call. It is possible that you | 198 | to delete the i2c_detach_client call. It is possible that you |
| 199 | can also remove the ret variable as it is not not needed for | 199 | can also remove the ret variable as it is not needed for any |
| 200 | any of the core functions. | 200 | of the core functions. |
| 201 | 201 | ||
| 202 | - static int example_detach(struct i2c_client *client) | 202 | - static int example_detach(struct i2c_client *client) |
| 203 | + static int example_remove(struct i2c_client *client) | 203 | + static int example_remove(struct i2c_client *client) |