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.
Unified · Split
| @@ -140,8 +140,8 @@ Hints · 139 unmodified lines | |||
| 140 | ----- | 140 | ----- |
| 141 | 141 | ||
| 142 | If you want to pass special arguments to your interpreter, you can | 142 | If you want to pass special arguments to your interpreter, you can |
| 143 | write a wrapper script for it. See Documentation/admin-guide/java.rst for an | 143 | write a wrapper script for it. |
| 144 | example. | 144 | See :doc:`Documentation/admin-guide/java.rst <./java>` for an example. |
| 145 | 145 | ||
| 146 | Your interpreter should NOT look in the PATH for the filename; the kernel | 146 | Your interpreter should NOT look in the PATH for the filename; the kernel |
| 147 | passes it the full filename (or the file descriptor) to use. Using ``$PATH`` can | 147 | passes it the full filename (or the file descriptor) to use. Using ``$PATH`` can |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | |||
| 18 | #define PA_IRLPRI4 (PA_BCR+0x000a) /* Interrupt Priorty 4 */ | 18 | #define PA_IRLPRI4 (PA_BCR+0x000a) /* Interrupt Priorty 4 */ |
| 19 | #define PA_RSTCTL (PA_BCR+0x000c) /* Reset Control */ | 19 | #define PA_RSTCTL (PA_BCR+0x000c) /* Reset Control */ |
| 20 | #define PA_PCIBD (PA_BCR+0x000e) /* PCI Board detect control */ | 20 | #define PA_PCIBD (PA_BCR+0x000e) /* PCI Board detect control */ |
| 21 | #define PA_PCICD (PA_BCR+0x0010) /* PCI Conector detect control */ | 21 | #define PA_PCICD (PA_BCR+0x0010) /* PCI Connector detect control */ |
| 22 | #define PA_EXTGIO (PA_BCR+0x0016) /* Extension GPIO Control */ | 22 | #define PA_EXTGIO (PA_BCR+0x0016) /* Extension GPIO Control */ |
| 23 | #define PA_IVDRMON (PA_BCR+0x0018) /* iVDR Moniter control */ | 23 | #define PA_IVDRMON (PA_BCR+0x0018) /* iVDR Moniter control */ |
| 24 | #define PA_IVDRCTL (PA_BCR+0x001a) /* iVDR control */ | 24 | #define PA_IVDRCTL (PA_BCR+0x001a) /* iVDR control */ |
| @@ -80,7 +80,7 @@ · 55 unmodified lines | |||
| 80 | #define PA_SDPOW (PA_BCR+0x0004) /* SD Power control */ | 80 | #define PA_SDPOW (PA_BCR+0x0004) /* SD Power control */ |
| 81 | #define PA_RSTCTL (PA_BCR+0x0006) /* Device Reset control */ | 81 | #define PA_RSTCTL (PA_BCR+0x0006) /* Device Reset control */ |
| 82 | #define PA_PCIBD (PA_BCR+0x0008) /* PCI Board detect control */ | 82 | #define PA_PCIBD (PA_BCR+0x0008) /* PCI Board detect control */ |
| 83 | #define PA_PCICD (PA_BCR+0x000a) /* PCI Conector detect control */ | 83 | #define PA_PCICD (PA_BCR+0x000a) /* PCI Connector detect control */ |
| 84 | #define PA_ZIGIO1 (PA_BCR+0x000c) /* Zigbee IO control 1 */ | 84 | #define PA_ZIGIO1 (PA_BCR+0x000c) /* Zigbee IO control 1 */ |
| 85 | #define PA_ZIGIO2 (PA_BCR+0x000e) /* Zigbee IO control 2 */ | 85 | #define PA_ZIGIO2 (PA_BCR+0x000e) /* Zigbee IO control 2 */ |
| 86 | #define PA_ZIGIO3 (PA_BCR+0x0010) /* Zigbee IO control 3 */ | 86 | #define PA_ZIGIO3 (PA_BCR+0x0010) /* Zigbee IO control 3 */ |
| @@ -60,7 +60,7 @@ int query_apm_bios(void) · 59 unmodified lines | |||
| 60 | intcall(0x15, &ireg, &oreg); | 60 | intcall(0x15, &ireg, &oreg); |
| 61 | 61 | ||
| 62 | if ((oreg.eflags & X86_EFLAGS_CF) || oreg.bx != 0x504d) { | 62 | if ((oreg.eflags & X86_EFLAGS_CF) || oreg.bx != 0x504d) { |
| 63 | /* Failure with 32-bit connect, try to disconect and ignore */ | 63 | /* Failure with 32-bit connect, try to disconnect and ignore */ |
| 64 | ireg.al = 0x04; | 64 | ireg.al = 0x04; |
| 65 | intcall(0x15, &ireg, NULL); | 65 | intcall(0x15, &ireg, NULL); |
| 66 | return -1; | 66 | return -1; |
| @@ -16,7 +16,7 @@ · 15 unmodified lines | |||
| 16 | * @first_vec: first interrupt vectors to use for queues (usually 0) | 16 | * @first_vec: first interrupt vectors to use for queues (usually 0) |
| 17 | * | 17 | * |
| 18 | * This function assumes the virtio device @vdev has at least as many available | 18 | * This function assumes the virtio device @vdev has at least as many available |
| 19 | * interrupt vetors as @set has queues. It will then queuery the vector | 19 | * interrupt vectors as @set has queues. It will then query the vector |
| 20 | * corresponding to each queue for it's affinity mask and built queue mapping | 20 | * corresponding to each queue for it's affinity mask and built queue mapping |
| 21 | * that maps a queue to the CPUs that have irq affinity for the corresponding | 21 | * that maps a queue to the CPUs that have irq affinity for the corresponding |
| 22 | * vector. | 22 | * vector. |
| @@ -677,7 +677,7 @@ static uint64_t sdma_v4_0_ring_get_wptr(struct amdgpu_ring *ring) · 676 unmodified lines | |||
| 677 | } | 677 | } |
| 678 | 678 | ||
| 679 | /** | 679 | /** |
| 680 | * sdma_v4_0_ring_set_wptr - commit the write pointer | 680 | * sdma_v4_0_page_ring_set_wptr - commit the write pointer |
| 681 | * | 681 | * |
| 682 | * @ring: amdgpu ring pointer | 682 | * @ring: amdgpu ring pointer |
| 683 | * | 683 | * |
| @@ -977,7 +977,7 @@ static void sdma_v4_0_page_stop(struct amdgpu_device *adev) · 293 unmodified lines | |||
| 977 | } | 977 | } |
| 978 | 978 | ||
| 979 | /** | 979 | /** |
| 980 | * sdma_v_0_ctx_switch_enable - stop the async dma engines context switch | 980 | * sdma_v4_0_ctx_switch_enable - stop the async dma engines context switch |
| 981 | * | 981 | * |
| 982 | * @adev: amdgpu_device pointer | 982 | * @adev: amdgpu_device pointer |
| 983 | * @enable: enable/disable the DMA MEs context switch. | 983 | * @enable: enable/disable the DMA MEs context switch. |
| @@ -1039,7 +1039,7 @@ config HID_U2FZERO · 1038 unmodified lines | |||
| 1039 | 1039 | ||
| 1040 | U2F Zero only supports blinking its LED, so this driver doesn't | 1040 | U2F Zero only supports blinking its LED, so this driver doesn't |
| 1041 | allow setting the brightness to anything but 1, which will | 1041 | allow setting the brightness to anything but 1, which will |
| 1042 | trigger a single blink and immediately reset to back 0. | 1042 | trigger a single blink and immediately reset back to 0. |
| 1043 | 1043 | ||
| 1044 | config HID_WACOM | 1044 | config HID_WACOM |
| 1045 | tristate "Wacom Intuos/Graphire tablet support (USB)" | 1045 | tristate "Wacom Intuos/Graphire tablet support (USB)" |
| @@ -1987,7 +1987,7 @@ dasd_3990_erp_compound_code(struct dasd_ccw_req * erp, char *sense) · 1986 unmodified lines | |||
| 1987 | * DASD_3990_ERP_COMPOUND_CONFIG | 1987 | * DASD_3990_ERP_COMPOUND_CONFIG |
| 1988 | * | 1988 | * |
| 1989 | * DESCRIPTION | 1989 | * DESCRIPTION |
| 1990 | * Handles the compound ERP action for configruation | 1990 | * Handles the compound ERP action for configuration |
| 1991 | * dependent error. | 1991 | * dependent error. |
| 1992 | * Note: duplex handling is not implemented (yet). | 1992 | * Note: duplex handling is not implemented (yet). |
| 1993 | * | 1993 | * |
| @@ -62,9 +62,6 @@ static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr) · 61 unmodified lines | |||
| 62 | return 0; | 62 | return 0; |
| 63 | } | 63 | } |
| 64 | 64 | ||
| 65 | /* Deprecated */ | ||
| 66 | #define PTR_RET(p) PTR_ERR_OR_ZERO(p) | ||
| 67 | |||
| 68 | #endif | 65 | #endif |
| 69 | 66 | ||
| 70 | #endif /* _LINUX_ERR_H */ | 67 | #endif /* _LINUX_ERR_H */ |
| @@ -145,7 +145,7 @@ static inline void hash_del_rcu(struct hlist_node *node) · 144 unmodified lines | |||
| 145 | * hash entry | 145 | * hash entry |
| 146 | * @name: hashtable to iterate | 146 | * @name: hashtable to iterate |
| 147 | * @bkt: integer to use as bucket loop cursor | 147 | * @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 |
| 149 | * @obj: the type * to use as a loop cursor for each entry | 149 | * @obj: the type * to use as a loop cursor for each entry |
| 150 | * @member: the name of the hlist_node within the struct | 150 | * @member: the name of the hlist_node within the struct |
| 151 | */ | 151 | */ |
| @@ -197,7 +197,7 @@ static inline void hash_del_rcu(struct hlist_node *node) · 45 unmodified lines | |||
| 197 | * same bucket safe against removals | 197 | * same bucket safe against removals |
| 198 | * @name: hashtable to iterate | 198 | * @name: hashtable to iterate |
| 199 | * @obj: the type * to use as a loop cursor for each entry | 199 | * @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 |
| 201 | * @member: the name of the hlist_node within the struct | 201 | * @member: the name of the hlist_node within the struct |
| 202 | * @key: the key of the objects to iterate over | 202 | * @key: the key of the objects to iterate over |
| 203 | */ | 203 | */ |
| @@ -24,7 +24,7 @@ struct pt_regs; · 23 unmodified lines | |||
| 24 | * @handle_irq: highlevel irq-events handler | 24 | * @handle_irq: highlevel irq-events handler |
| 25 | * @preflow_handler: handler called before the flow handler (currently used by sparc) | 25 | * @preflow_handler: handler called before the flow handler (currently used by sparc) |
| 26 | * @action: the irq action chain | 26 | * @action: the irq action chain |
| 27 | * @status: status information | 27 | * @status_use_accessors: status information |
| 28 | * @core_internal_state__do_not_mess_with_it: core internal status information | 28 | * @core_internal_state__do_not_mess_with_it: core internal status information |
| 29 | * @depth: disable-depth, for nested irq_disable() calls | 29 | * @depth: disable-depth, for nested irq_disable() calls |
| 30 | * @wake_depth: enable depth, for multiple irq_set_irq_wake() callers | 30 | * @wake_depth: enable depth, for multiple irq_set_irq_wake() callers |
| @@ -989,7 +989,7 @@ static inline void hlist_move_list(struct hlist_head *old, · 988 unmodified lines | |||
| 989 | /** | 989 | /** |
| 990 | * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry | 990 | * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry |
| 991 | * @pos: the type * to use as a loop cursor. | 991 | * @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 |
| 993 | * @head: the head for your list. | 993 | * @head: the head for your list. |
| 994 | * @member: the name of the hlist_node within the struct. | 994 | * @member: the name of the hlist_node within the struct. |
| 995 | */ | 995 | */ |
| @@ -33,7 +33,7 @@ struct wm8994_ldo_pdata { · 32 unmodified lines | |||
| 33 | * DRC configurations are specified with a label and a set of register | 33 | * DRC configurations are specified with a label and a set of register |
| 34 | * values to write (the enable bits will be ignored). At runtime an | 34 | * values to write (the enable bits will be ignored). At runtime an |
| 35 | * enumerated control will be presented for each DRC block allowing | 35 | * 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. |
| 37 | * | 37 | * |
| 38 | * Configurations may be generated by hand or by using the DRC control | 38 | * Configurations may be generated by hand or by using the DRC control |
| 39 | * panel provided by the WISCE - see http://www.wolfsonmicro.com/wisce/ | 39 | * panel provided by the WISCE - see http://www.wolfsonmicro.com/wisce/ |