diff options
-rw-r--r-- | arch/arc/plat-arcfpga/Kconfig | 2 | ||||
-rw-r--r-- | arch/blackfin/include/asm/bfin_sport3.h | 2 | ||||
-rw-r--r-- | arch/s390/kernel/irq.c | 2 | ||||
-rw-r--r-- | arch/s390/kvm/trace.h | 2 | ||||
-rw-r--r-- | drivers/crypto/caam/ctrl.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 | ||||
-rw-r--r-- | drivers/i2c/busses/i2c-puv3.c | 2 | ||||
-rw-r--r-- | drivers/scsi/qla4xxx/ql4_nx.c | 2 | ||||
-rw-r--r-- | drivers/usb/misc/uss720.c | 2 | ||||
-rw-r--r-- | include/trace/events/timer.h | 10 | ||||
-rw-r--r-- | sound/pci/mixart/mixart.c | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/arch/arc/plat-arcfpga/Kconfig b/arch/arc/plat-arcfpga/Kconfig index b41e786cdbc0..295cefeb25d3 100644 --- a/arch/arc/plat-arcfpga/Kconfig +++ b/arch/arc/plat-arcfpga/Kconfig | |||
@@ -53,7 +53,7 @@ menuconfig ARC_HAS_BVCI_LAT_UNIT | |||
53 | bool "BVCI Bus Latency Unit" | 53 | bool "BVCI Bus Latency Unit" |
54 | depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4 | 54 | depends on ARC_BOARD_ML509 || ARC_BOARD_ANGEL4 |
55 | help | 55 | help |
56 | IP to add artifical latency to BVCI Bus Based FPGA builds. | 56 | IP to add artificial latency to BVCI Bus Based FPGA builds. |
57 | The default latency (even worst case) for FPGA is non-realistic | 57 | The default latency (even worst case) for FPGA is non-realistic |
58 | (~10 SDRAM, ~5 SSRAM). | 58 | (~10 SDRAM, ~5 SSRAM). |
59 | 59 | ||
diff --git a/arch/blackfin/include/asm/bfin_sport3.h b/arch/blackfin/include/asm/bfin_sport3.h index 03c00220d69b..d82f5fa0ad9f 100644 --- a/arch/blackfin/include/asm/bfin_sport3.h +++ b/arch/blackfin/include/asm/bfin_sport3.h | |||
@@ -41,7 +41,7 @@ | |||
41 | #define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */ | 41 | #define SPORT_CTL_LAFS 0x00020000 /* Late Transmit frame select */ |
42 | #define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */ | 42 | #define SPORT_CTL_RJUST 0x00040000 /* Right Justified mode select */ |
43 | #define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */ | 43 | #define SPORT_CTL_FSED 0x00080000 /* External frame sync edge select */ |
44 | #define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrrupt enable select */ | 44 | #define SPORT_CTL_TFIEN 0x00100000 /* Transmit finish interrupt enable select */ |
45 | #define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */ | 45 | #define SPORT_CTL_GCLKEN 0x00200000 /* Gated clock mode select */ |
46 | #define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */ | 46 | #define SPORT_CTL_SPENSEC 0x01000000 /* Enable secondary channel */ |
47 | #define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */ | 47 | #define SPORT_CTL_SPTRAN 0x02000000 /* Data direction control */ |
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 1630f439cd2a..4f5ef62934a4 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c | |||
@@ -33,7 +33,7 @@ struct irq_class { | |||
33 | }; | 33 | }; |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * The list of "main" irq classes on s390. This is the list of interrrupts | 36 | * The list of "main" irq classes on s390. This is the list of interrupts |
37 | * that appear both in /proc/stat ("intr" line) and /proc/interrupts. | 37 | * that appear both in /proc/stat ("intr" line) and /proc/interrupts. |
38 | * Historically only external and I/O interrupts have been part of /proc/stat. | 38 | * Historically only external and I/O interrupts have been part of /proc/stat. |
39 | * We can't add the split external and I/O sub classes since the first field | 39 | * We can't add the split external and I/O sub classes since the first field |
diff --git a/arch/s390/kvm/trace.h b/arch/s390/kvm/trace.h index 2b29e62351d3..747898805359 100644 --- a/arch/s390/kvm/trace.h +++ b/arch/s390/kvm/trace.h | |||
@@ -67,7 +67,7 @@ TRACE_EVENT(kvm_s390_sie_fault, | |||
67 | #define sie_intercept_code \ | 67 | #define sie_intercept_code \ |
68 | {0x04, "Instruction"}, \ | 68 | {0x04, "Instruction"}, \ |
69 | {0x08, "Program interruption"}, \ | 69 | {0x08, "Program interruption"}, \ |
70 | {0x0C, "Instruction and program interuption"}, \ | 70 | {0x0C, "Instruction and program interruption"}, \ |
71 | {0x10, "External request"}, \ | 71 | {0x10, "External request"}, \ |
72 | {0x14, "External interruption"}, \ | 72 | {0x14, "External interruption"}, \ |
73 | {0x18, "I/O request"}, \ | 73 | {0x18, "I/O request"}, \ |
diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 1c56f63524f2..8acf00490fd5 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c | |||
@@ -66,7 +66,7 @@ static void build_instantiation_desc(u32 *desc) | |||
66 | 66 | ||
67 | /* | 67 | /* |
68 | * load 1 to clear written reg: | 68 | * load 1 to clear written reg: |
69 | * resets the done interrrupt and returns the RNG to idle. | 69 | * resets the done interrupt and returns the RNG to idle. |
70 | */ | 70 | */ |
71 | append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); | 71 | append_load_imm_u32(desc, 1, LDST_SRCDST_WORD_CLRW); |
72 | 72 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 90374dd77960..8c8a7f0d982e 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c | |||
@@ -270,7 +270,7 @@ int radeon_irq_kms_init(struct radeon_device *rdev) | |||
270 | } | 270 | } |
271 | 271 | ||
272 | /** | 272 | /** |
273 | * radeon_irq_kms_fini - tear down driver interrrupt info | 273 | * radeon_irq_kms_fini - tear down driver interrupt info |
274 | * | 274 | * |
275 | * @rdev: radeon device pointer | 275 | * @rdev: radeon device pointer |
276 | * | 276 | * |
diff --git a/drivers/i2c/busses/i2c-puv3.c b/drivers/i2c/busses/i2c-puv3.c index 261d7db437e2..8acef657abf3 100644 --- a/drivers/i2c/busses/i2c-puv3.c +++ b/drivers/i2c/busses/i2c-puv3.c | |||
@@ -199,7 +199,7 @@ static int puv3_i2c_probe(struct platform_device *pdev) | |||
199 | 199 | ||
200 | adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL); | 200 | adapter = kzalloc(sizeof(struct i2c_adapter), GFP_KERNEL); |
201 | if (adapter == NULL) { | 201 | if (adapter == NULL) { |
202 | dev_err(&pdev->dev, "can't allocate inteface!\n"); | 202 | dev_err(&pdev->dev, "can't allocate interface!\n"); |
203 | rc = -ENOMEM; | 203 | rc = -ENOMEM; |
204 | goto fail_nomem; | 204 | goto fail_nomem; |
205 | } | 205 | } |
diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c index 71d3d234f526..9299400d3c9e 100644 --- a/drivers/scsi/qla4xxx/ql4_nx.c +++ b/drivers/scsi/qla4xxx/ql4_nx.c | |||
@@ -2089,7 +2089,7 @@ static int qla4_8xxx_minidump_process_rdmem(struct scsi_qla_host *ha, | |||
2089 | 2089 | ||
2090 | if (r_addr & 0xf) { | 2090 | if (r_addr & 0xf) { |
2091 | DEBUG2(ql4_printk(KERN_INFO, ha, | 2091 | DEBUG2(ql4_printk(KERN_INFO, ha, |
2092 | "[%s]: Read addr 0x%x not 16 bytes alligned\n", | 2092 | "[%s]: Read addr 0x%x not 16 bytes aligned\n", |
2093 | __func__, r_addr)); | 2093 | __func__, r_addr)); |
2094 | return QLA_ERROR; | 2094 | return QLA_ERROR; |
2095 | } | 2095 | } |
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index 29cad9e0a7a9..e129cf661223 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c | |||
@@ -705,7 +705,7 @@ static int uss720_probe(struct usb_interface *intf, | |||
705 | return -ENODEV; | 705 | return -ENODEV; |
706 | } | 706 | } |
707 | i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2); | 707 | i = usb_set_interface(usbdev, intf->altsetting->desc.bInterfaceNumber, 2); |
708 | dev_dbg(&intf->dev, "set inteface result %d\n", i); | 708 | dev_dbg(&intf->dev, "set interface result %d\n", i); |
709 | 709 | ||
710 | interface = intf->cur_altsetting; | 710 | interface = intf->cur_altsetting; |
711 | 711 | ||
diff --git a/include/trace/events/timer.h b/include/trace/events/timer.h index 425bcfe56c62..8d219470624f 100644 --- a/include/trace/events/timer.h +++ b/include/trace/events/timer.h | |||
@@ -123,7 +123,7 @@ DEFINE_EVENT(timer_class, timer_cancel, | |||
123 | 123 | ||
124 | /** | 124 | /** |
125 | * hrtimer_init - called when the hrtimer is initialized | 125 | * hrtimer_init - called when the hrtimer is initialized |
126 | * @timer: pointer to struct hrtimer | 126 | * @hrtimer: pointer to struct hrtimer |
127 | * @clockid: the hrtimers clock | 127 | * @clockid: the hrtimers clock |
128 | * @mode: the hrtimers mode | 128 | * @mode: the hrtimers mode |
129 | */ | 129 | */ |
@@ -155,7 +155,7 @@ TRACE_EVENT(hrtimer_init, | |||
155 | 155 | ||
156 | /** | 156 | /** |
157 | * hrtimer_start - called when the hrtimer is started | 157 | * hrtimer_start - called when the hrtimer is started |
158 | * @timer: pointer to struct hrtimer | 158 | * @hrtimer: pointer to struct hrtimer |
159 | */ | 159 | */ |
160 | TRACE_EVENT(hrtimer_start, | 160 | TRACE_EVENT(hrtimer_start, |
161 | 161 | ||
@@ -186,8 +186,8 @@ TRACE_EVENT(hrtimer_start, | |||
186 | ); | 186 | ); |
187 | 187 | ||
188 | /** | 188 | /** |
189 | * htimmer_expire_entry - called immediately before the hrtimer callback | 189 | * hrtimer_expire_entry - called immediately before the hrtimer callback |
190 | * @timer: pointer to struct hrtimer | 190 | * @hrtimer: pointer to struct hrtimer |
191 | * @now: pointer to variable which contains current time of the | 191 | * @now: pointer to variable which contains current time of the |
192 | * timers base. | 192 | * timers base. |
193 | * | 193 | * |
@@ -234,7 +234,7 @@ DECLARE_EVENT_CLASS(hrtimer_class, | |||
234 | 234 | ||
235 | /** | 235 | /** |
236 | * hrtimer_expire_exit - called immediately after the hrtimer callback returns | 236 | * hrtimer_expire_exit - called immediately after the hrtimer callback returns |
237 | * @timer: pointer to struct hrtimer | 237 | * @hrtimer: pointer to struct hrtimer |
238 | * | 238 | * |
239 | * When used in combination with the hrtimer_expire_entry tracepoint we can | 239 | * When used in combination with the hrtimer_expire_entry tracepoint we can |
240 | * determine the runtime of the callback function. | 240 | * determine the runtime of the callback function. |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 01f7f37a8410..934dec98e2ce 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -1175,7 +1175,7 @@ static void snd_mixart_proc_read(struct snd_info_entry *entry, | |||
1175 | 1175 | ||
1176 | snd_iprintf(buffer, "\tstreaming : %d\n", streaming); | 1176 | snd_iprintf(buffer, "\tstreaming : %d\n", streaming); |
1177 | snd_iprintf(buffer, "\tmailbox : %d\n", mailbox); | 1177 | snd_iprintf(buffer, "\tmailbox : %d\n", mailbox); |
1178 | snd_iprintf(buffer, "\tinterrups handling : %d\n\n", interr); | 1178 | snd_iprintf(buffer, "\tinterrupts handling : %d\n\n", interr); |
1179 | } | 1179 | } |
1180 | } /* endif elf loaded */ | 1180 | } /* endif elf loaded */ |
1181 | } | 1181 | } |