History

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

Pull trivial tree updates from Jiri Kosina: "My attempt to revitalize trivial queue I've been neglecting for years (what a disaster that was for this world, right? :) ) with patches collected from backlog that were still relevant and not applied elsewhere in the meantime" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: err.h: remove deprecated PTR_RET for good blk-mq: Fix typo in comment x86/boot: Fix comment spelling sh: mach-highlander: Fix comment spelling s390/dasd: Fix comment spelling mfd: wm8994: Fix comment spelling docs: Add reference in binfmt-misc.rst genirq: fix kerneldoc comment for irq_desc drm/amdgpu: fix two documentation mismatch issues HID: fix Kconfig word ordering list/hashtable: minor documentation corrections.

Linus Torvalds committed 6 years ago

Commit 69c1fd92 parents 72f3542 fad7c9012 files · +15 −18Browse files

Showing the changes to include/linux (5 of 12 files). Show all

Unified · Split

5 files
  1. include/linux/err.h +0 −3
  2. include/linux/hashtable.h +2 −2
  3. include/linux/irqdesc.h +1 −1
  4. include/linux/list.h +1 −1
  5. include/linux/mfd/wm8994/pdata.h +1 −1
include/linux/err.h+0−3
@@ -62,9 +62,6 @@ static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr) · 61 unmodified lines
6262 return 0;
6363 }
6464
65−/* Deprecated */
66−#define PTR_RET(p) PTR_ERR_OR_ZERO(p)
67−
6865 #endif
6966
7067 #endif /* _LINUX_ERR_H */
include/linux/hashtable.h+2−2
@@ -145,7 +145,7 @@ static inline void hash_del_rcu(struct hlist_node *node) · 144 unmodified lines
145145 * hash entry
146146 * @name: hashtable to iterate
147147 * @bkt: integer to use as bucket loop cursor
148− * @tmp: a &struct used for temporary storage
148+ * @tmp: a &struct hlist_node used for temporary storage
149149 * @obj: the type * to use as a loop cursor for each entry
150150 * @member: the name of the hlist_node within the struct
151151 */
@@ -197,7 +197,7 @@ static inline void hash_del_rcu(struct hlist_node *node) · 45 unmodified lines
197197 * same bucket safe against removals
198198 * @name: hashtable to iterate
199199 * @obj: the type * to use as a loop cursor for each entry
200− * @tmp: a &struct used for temporary storage
200+ * @tmp: a &struct hlist_node used for temporary storage
201201 * @member: the name of the hlist_node within the struct
202202 * @key: the key of the objects to iterate over
203203 */
include/linux/irqdesc.h+1−1
@@ -24,7 +24,7 @@ struct pt_regs; · 23 unmodified lines
2424 * @handle_irq: highlevel irq-events handler
2525 * @preflow_handler: handler called before the flow handler (currently used by sparc)
2626 * @action: the irq action chain
27− * @status: status information
27+ * @status_use_accessors: status information
2828 * @core_internal_state__do_not_mess_with_it: core internal status information
2929 * @depth: disable-depth, for nested irq_disable() calls
3030 * @wake_depth: enable depth, for multiple irq_set_irq_wake() callers
include/linux/list.h+1−1
@@ -989,7 +989,7 @@ static inline void hlist_move_list(struct hlist_head *old, · 988 unmodified lines
989989 /**
990990 * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
991991 * @pos: the type * to use as a loop cursor.
992− * @n: another &struct hlist_node to use as temporary storage
992+ * @n: a &struct hlist_node to use as temporary storage
993993 * @head: the head for your list.
994994 * @member: the name of the hlist_node within the struct.
995995 */
include/linux/mfd/wm8994/pdata.h+1−1
@@ -33,7 +33,7 @@ struct wm8994_ldo_pdata { · 32 unmodified lines
3333 * DRC configurations are specified with a label and a set of register
3434 * values to write (the enable bits will be ignored). At runtime an
3535 * enumerated control will be presented for each DRC block allowing
36− * the user to choose the configration to use.
36+ * the user to choose the configuration to use.
3737 *
3838 * Configurations may be generated by hand or by using the DRC control
3939 * panel provided by the WISCE - see http://www.wolfsonmicro.com/wisce/