aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasanari Iida <standby24x7@gmail.com>2012-11-30 00:10:25 -0500
committerJiri Kosina <jkosina@suse.cz>2012-12-03 05:05:04 -0500
commit9c7682075e507c95c523477cfe6ce539406d9f4a (patch)
tree442f75f99f8581b2d7ae2cfc55ab14ad43d67750
parente41e85cc17fc903a1f1eaae6b69608942952e5d2 (diff)
treewide: Fix typos in various drivers
Fix typos in printk within various drivers. Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--arch/arm/mach-netx/xc.c2
-rw-r--r--arch/blackfin/mach-bf609/Kconfig2
-rw-r--r--drivers/media/dvb-frontends/drxk_hard.c2
-rw-r--r--drivers/media/platform/mx2_emmaprp.c2
-rw-r--r--drivers/remoteproc/remoteproc_elf_loader.c4
-rw-r--r--tools/perf/Documentation/perf-record.txt2
6 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-netx/xc.c b/arch/arm/mach-netx/xc.c
index e4cfb7e5361d..f1c972d87bac 100644
--- a/arch/arm/mach-netx/xc.c
+++ b/arch/arm/mach-netx/xc.c
@@ -136,7 +136,7 @@ int xc_request_firmware(struct xc *x)
136 if (head->magic != 0x4e657458) { 136 if (head->magic != 0x4e657458) {
137 if (head->magic == 0x5874654e) { 137 if (head->magic == 0x5874654e) {
138 dev_err(x->dev, 138 dev_err(x->dev,
139 "firmware magic is 'XteN'. Endianess problems?\n"); 139 "firmware magic is 'XteN'. Endianness problems?\n");
140 ret = -ENODEV; 140 ret = -ENODEV;
141 goto exit_release_firmware; 141 goto exit_release_firmware;
142 } 142 }
diff --git a/arch/blackfin/mach-bf609/Kconfig b/arch/blackfin/mach-bf609/Kconfig
index 101b33ee9bba..95a4f1b676ce 100644
--- a/arch/blackfin/mach-bf609/Kconfig
+++ b/arch/blackfin/mach-bf609/Kconfig
@@ -56,7 +56,7 @@ config SEC_IRQ_PRIORITY_LEVELS
56 default 7 56 default 7
57 range 0 7 57 range 0 7
58 help 58 help
59 Devide the total number of interrupt priority levels into sub-levels. 59 Divide the total number of interrupt priority levels into sub-levels.
60 There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels. 60 There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels.
61 61
62endmenu 62endmenu
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 8b4c6d5f8f36..df9abe83f877 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -948,7 +948,7 @@ static int GetDeviceCapabilities(struct drxk_state *state)
948 state->m_oscClockFreq = 20250; 948 state->m_oscClockFreq = 20250;
949 break; 949 break;
950 default: 950 default:
951 printk(KERN_ERR "drxk: Clock Frequency is unkonwn\n"); 951 printk(KERN_ERR "drxk: Clock Frequency is unknown\n");
952 return -EINVAL; 952 return -EINVAL;
953 } 953 }
954 /* 954 /*
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 8f22ce543cf7..bfa65079fc38 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -371,7 +371,7 @@ static irqreturn_t emmaprp_irq(int irq_emma, void *data)
371 if (!curr_ctx->aborting) { 371 if (!curr_ctx->aborting) {
372 if ((irqst & PRP_INTR_ST_RDERR) || 372 if ((irqst & PRP_INTR_ST_RDERR) ||
373 (irqst & PRP_INTR_ST_CH2WERR)) { 373 (irqst & PRP_INTR_ST_CH2WERR)) {
374 pr_err("PrP bus error ocurred, this transfer is probably corrupted\n"); 374 pr_err("PrP bus error occurred, this transfer is probably corrupted\n");
375 writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL); 375 writel(PRP_CNTL_SWRST, pcdev->base_emma + PRP_CNTL);
376 } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */ 376 } else if (irqst & PRP_INTR_ST_CH2B1CI) { /* buffer ready */
377 src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx); 377 src_vb = v4l2_m2m_src_buf_remove(curr_ctx->m2m_ctx);
diff --git a/drivers/remoteproc/remoteproc_elf_loader.c b/drivers/remoteproc/remoteproc_elf_loader.c
index e1f89d649733..0d36f94ab51d 100644
--- a/drivers/remoteproc/remoteproc_elf_loader.c
+++ b/drivers/remoteproc/remoteproc_elf_loader.c
@@ -66,13 +66,13 @@ rproc_elf_sanity_check(struct rproc *rproc, const struct firmware *fw)
66 return -EINVAL; 66 return -EINVAL;
67 } 67 }
68 68
69 /* We assume the firmware has the same endianess as the host */ 69 /* We assume the firmware has the same endianness as the host */
70# ifdef __LITTLE_ENDIAN 70# ifdef __LITTLE_ENDIAN
71 if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) { 71 if (ehdr->e_ident[EI_DATA] != ELFDATA2LSB) {
72# else /* BIG ENDIAN */ 72# else /* BIG ENDIAN */
73 if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) { 73 if (ehdr->e_ident[EI_DATA] != ELFDATA2MSB) {
74# endif 74# endif
75 dev_err(dev, "Unsupported firmware endianess\n"); 75 dev_err(dev, "Unsupported firmware endianness\n");
76 return -EINVAL; 76 return -EINVAL;
77 } 77 }
78 78
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index b38a1f9ad460..938e8904f64d 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -175,7 +175,7 @@ following filters are defined:
175 175
176+ 176+
177The option requires at least one branch type among any, any_call, any_ret, ind_call. 177The option requires at least one branch type among any, any_call, any_ret, ind_call.
178The privilege levels may be ommitted, in which case, the privilege levels of the associated 178The privilege levels may be omitted, in which case, the privilege levels of the associated
179event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege 179event are applied to the branch filter. Both kernel (k) and hypervisor (hv) privilege
180levels are subject to permissions. When sampling on multiple events, branch stack sampling 180levels are subject to permissions. When sampling on multiple events, branch stack sampling
181is enabled for all the sampling events. The sampled branch type is the same for all events. 181is enabled for all the sampling events. The sampled branch type is the same for all events.