Skip to content

Commit d0bbe0d

Browse files
committed
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina: "Usual trivial tree updates. Nothing outstanding -- mostly printk() and comment fixes and unused identifier removals" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: goldfish: goldfish_tty_probe() is not using 'i' any more powerpc: Fix comment in smu.h qla2xxx: Fix printks in ql_log message lib: correct link to the original source for div64_u64 si2168, tda10071, m88ds3103: Fix firmware wording usb: storage: Fix printk in isd200_log_config() qla2xxx: Fix printk in qla25xx_setup_mode init/main: fix reset_device comment ipwireless: missing assignment goldfish: remove unreachable line of code coredump: Fix do_coredump() comment stacktrace.h: remove duplicate declaration task_struct smpboot.h: Remove unused function prototype treewide: Fix typo in printk messages treewide: Fix typo in printk messages mod_devicetable: fix comment for match_flags
2 parents 8de29a3 + 0e4f93e commit d0bbe0d

File tree

46 files changed

+54
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+54
-59
lines changed

arch/arc/kernel/unwind.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -841,7 +841,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc,
841841
break;
842842
case DW_CFA_GNU_window_save:
843843
default:
844-
unw_debug("UNKNOW OPCODE 0x%x\n", opcode);
844+
unw_debug("UNKNOWN OPCODE 0x%x\n", opcode);
845845
result = 0;
846846
break;
847847
}

arch/powerpc/include/asm/smu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ extern unsigned long smu_cmdbuf_abs;
478478

479479

480480
/*
481-
* Kenrel asynchronous i2c interface
481+
* Kernel asynchronous i2c interface
482482
*/
483483

484484
#define SMU_I2C_READ_MAX 0x1d

arch/powerpc/kernel/prom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ void __init early_init_devtree(void *params)
721721
*/
722722
of_scan_flat_dt(early_init_dt_scan_cpus, NULL);
723723
if (boot_cpuid < 0) {
724-
printk("Failed to indentify boot CPU !\n");
724+
printk("Failed to identify boot CPU !\n");
725725
BUG();
726726
}
727727

arch/powerpc/perf/hv-24x7.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ static int h_24x7_event_init(struct perf_event *event)
11261126
/* Physical domains & other lpars require extra capabilities */
11271127
if (!caps.collect_privileged && (is_physical_domain(domain) ||
11281128
(event_get_lpar(event) != event_get_lpar_max()))) {
1129-
pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n",
1129+
pr_devel("hv permissions disallow: is_physical_domain:%d, lpar=0x%llx\n",
11301130
is_physical_domain(domain),
11311131
event_get_lpar(event));
11321132
return -EACCES;

arch/powerpc/platforms/85xx/p1022_rdk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@ void p1022rdk_set_pixel_clock(unsigned int pixclock)
5050
/* Map the global utilities registers. */
5151
guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts");
5252
if (!guts_np) {
53-
pr_err("p1022rdk: missing global utilties device node\n");
53+
pr_err("p1022rdk: missing global utilities device node\n");
5454
return;
5555
}
5656

5757
guts = of_iomap(guts_np, 0);
5858
of_node_put(guts_np);
5959
if (!guts) {
60-
pr_err("p1022rdk: could not map global utilties device\n");
60+
pr_err("p1022rdk: could not map global utilities device\n");
6161
return;
6262
}
6363

arch/x86/kernel/test_rodata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ int rodata_test(void)
5757
/* test 3: check the value hasn't changed */
5858
/* If this test fails, we managed to overwrite the data */
5959
if (!rodata_test_data) {
60-
printk(KERN_ERR "rodata_test: Test 3 failes (end data)\n");
60+
printk(KERN_ERR "rodata_test: Test 3 fails (end data)\n");
6161
return -ENODEV;
6262
}
6363
/* test 4: check if the rodata section is 4Kb aligned */

drivers/iio/adc/max1027.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ static int max1027_probe(struct spi_device *spi)
436436
indio_dev->num_channels * 2,
437437
GFP_KERNEL);
438438
if (st->buffer == NULL) {
439-
dev_err(&indio_dev->dev, "Can't allocate bufffer\n");
439+
dev_err(&indio_dev->dev, "Can't allocate buffer\n");
440440
return -ENOMEM;
441441
}
442442

drivers/isdn/hardware/mISDN/mISDNinfineon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1092,7 +1092,7 @@ inf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
10921092
}
10931093
card->ci = get_card_info(ent->driver_data);
10941094
if (!card->ci) {
1095-
pr_info("mISDN: do not have informations about adapter at %s\n",
1095+
pr_info("mISDN: do not have information about adapter at %s\n",
10961096
pci_name(pdev));
10971097
kfree(card);
10981098
pci_disable_device(pdev);

drivers/isdn/mISDN/dsp_cmx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ dsp_cmx_del_conf_member(struct dsp *dsp)
295295
}
296296
}
297297
printk(KERN_WARNING
298-
"%s: dsp is not present in its own conf_meber list.\n",
298+
"%s: dsp is not present in its own conf_member list.\n",
299299
__func__);
300300

301301
return -EINVAL;

drivers/isdn/mISDN/dsp_core.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
460460
}
461461
if (dsp_debug & DEBUG_DSP_CORE)
462462
printk(KERN_DEBUG "%s: enable mixing of "
463-
"tx-data with conf mebers\n", __func__);
463+
"tx-data with conf members\n", __func__);
464464
dsp->tx_mix = 1;
465465
dsp_cmx_hardware(dsp->conf, dsp);
466466
dsp_rx_off(dsp);
@@ -474,7 +474,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
474474
}
475475
if (dsp_debug & DEBUG_DSP_CORE)
476476
printk(KERN_DEBUG "%s: disable mixing of "
477-
"tx-data with conf mebers\n", __func__);
477+
"tx-data with conf members\n", __func__);
478478
dsp->tx_mix = 0;
479479
dsp_cmx_hardware(dsp->conf, dsp);
480480
dsp_rx_off(dsp);

0 commit comments

Comments
 (0)