Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0bbe0dd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8de29a35 0e4f93e5

arch/arc/kernel/unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -841,7 +841,7 @@ static int processCFI(const u8 *start, const u8 *end, unsigned long targetLoc, 
				break;

			case DW_CFA_GNU_window_save:

			default:

				unw_debug("UNKNOW OPCODE 0x%x\n", opcode);

				unw_debug("UNKNOWN OPCODE 0x%x\n", opcode);

				result = 0;

				break;

			}

arch/powerpc/include/asm/smu.h

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ extern unsigned long smu_cmdbuf_abs; 




/*

 * Kenrel asynchronous i2c interface

 * Kernel asynchronous i2c interface

 */



#define SMU_I2C_READ_MAX	0x1d

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ void __init early_init_devtree(void *params) 
	 */

	of_scan_flat_dt(early_init_dt_scan_cpus, NULL);

	if (boot_cpuid < 0) {

		printk("Failed to indentify boot CPU !\n");

		printk("Failed to identify boot CPU !\n");

		BUG();

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -1126,7 +1126,7 @@ static int h_24x7_event_init(struct perf_event *event) 
	/* Physical domains & other lpars require extra capabilities */

	if (!caps.collect_privileged && (is_physical_domain(domain) ||

		(event_get_lpar(event) != event_get_lpar_max()))) {

		pr_devel("hv permisions disallow: is_physical_domain:%d, lpar=0x%llx\n",

		pr_devel("hv permissions disallow: is_physical_domain:%d, lpar=0x%llx\n",

				is_physical_domain(domain),

				event_get_lpar(event));

		return -EACCES;

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

+2 −2
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ void p1022rdk_set_pixel_clock(unsigned int pixclock) 
	/* Map the global utilities registers. */

	guts_np = of_find_compatible_node(NULL, NULL, "fsl,p1022-guts");

	if (!guts_np) {

		pr_err("p1022rdk: missing global utilties device node\n");

		pr_err("p1022rdk: missing global utilities device node\n");

		return;

	}



	guts = of_iomap(guts_np, 0);

	of_node_put(guts_np);

	if (!guts) {

		pr_err("p1022rdk: could not map global utilties device\n");

		pr_err("p1022rdk: could not map global utilities device\n");

		return;

	}