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

Commit 98adf932 authored by Andrew Lunn's avatar Andrew Lunn Committed by Jason Cooper
Browse files

ARM: Kirkwood: checkpatch cleanups 



Mostly printk to pr_{err|info} changes and a few strings split over
multiple lines are combined.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent d1c925b2

arch/arm/mach-kirkwood/board-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static void __init kirkwood_dt_init(void) 
			     kirkwood_auxdata_lookup, NULL);

}



static const char *kirkwood_dt_board_compat[] = {

static const char * const kirkwood_dt_board_compat[] = {

	"globalscale,dreamplug",

	"dlink,dns-320",

	"dlink,dns-325",

arch/arm/mach-kirkwood/common.c

+4 −5
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 
#include <linux/clk-provider.h>

#include <linux/spinlock.h>

#include <linux/mv643xx_i2c.h>

#include <linux/timex.h>

#include <linux/kexec.h>

#include <net/dsa.h>

#include <asm/page.h>

#include <asm/timex.h>

#include <asm/kexec.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>

#include <mach/kirkwood.h>
@@ -646,8 +646,7 @@ void __init kirkwood_l2_init(void) 


void __init kirkwood_init(void)

{

	printk(KERN_INFO "Kirkwood: %s, TCLK=%d.\n",

		kirkwood_id(), kirkwood_tclk);

	pr_info("Kirkwood: %s, TCLK=%d.\n", kirkwood_id(), kirkwood_tclk);



	/*

	 * Disable propagation of mbus errors to the CPU local bus,

arch/arm/mach-kirkwood/common.h

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ void kirkwood_i2c_init(void); 
void kirkwood_uart0_init(void);

void kirkwood_uart1_init(void);

void kirkwood_nand_init(struct mtd_partition *parts, int nr_parts, int delay);

void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts, int (*dev_ready)(struct mtd_info *));

void kirkwood_nand_init_rnb(struct mtd_partition *parts, int nr_parts,

			    int (*dev_ready)(struct mtd_info *));

void kirkwood_audio_init(void);

void kirkwood_restart(char, const char *);

void kirkwood_clk_init(void);

arch/arm/mach-kirkwood/cpuidle.c

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static int kirkwood_init_cpuidle(void) 


	cpuidle_register_driver(&kirkwood_idle_driver);

	if (cpuidle_register_device(device)) {

		printk(KERN_ERR "kirkwood_init_cpuidle: Failed registering\n");

		pr_err("kirkwood_init_cpuidle: Failed registering\n");

		return -EIO;

	}

	return 0;

arch/arm/mach-kirkwood/dockstar-setup.c

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static void __init dockstar_init(void) 


	if (gpio_request(29, "USB Power Enable") != 0 ||

	    gpio_direction_output(29, 1) != 0)

		printk(KERN_ERR "can't set up GPIO 29 (USB Power Enable)\n");

		pr_err("can't set up GPIO 29 (USB Power Enable)\n");

	kirkwood_ehci_init();



	kirkwood_ge00_init(&dockstar_ge00_data);