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

Commit 47bb3b31 authored by Marcelo Roberto Jimenez's avatar Marcelo Roberto Jimenez Committed by Russell King
Browse files

ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 



This patch fixes checkpatch.pl issues in
arch/arm/mach-sa1100/cpu-sa1110.c.

Signed-off-by: default avatarMarcelo Roberto Jimenez <mroberto@cpti.cetuc.puc-rio.br>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9f15d2ca

arch/arm/mach-sa1100/cpu-sa1110.c

+13 −11
Original line number Diff line number Diff line
@@ -185,11 +185,13 @@ sdram_calculate_timing(struct sdram_info *sd, u_int cpu_khz, 
		sd->mdrefr |= MDREFR_K1DB2;



	/* initial number of '1's in MDCAS + 1 */

	set_mdcas(sd->mdcas, sd_khz >= 62000, ns_to_cycles(sdram->trcd, mem_khz));

	set_mdcas(sd->mdcas, sd_khz >= 62000,

		ns_to_cycles(sdram->trcd, mem_khz));



#ifdef DEBUG

	printk("MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n",

		sd->mdcnfg, sd->mdrefr, sd->mdcas[0], sd->mdcas[1], sd->mdcas[2]);

	printk(KERN_DEBUG "MDCNFG: %08x MDREFR: %08x MDCAS0: %08x MDCAS1: %08x MDCAS2: %08x\n",

		sd->mdcnfg, sd->mdrefr, sd->mdcas[0], sd->mdcas[1],

		sd->mdcas[2]);

#endif

}
@@ -218,7 +220,7 @@ sdram_update_refresh(u_int cpu_khz, struct sdram_params *sdram) 


#ifdef DEBUG

	mdelay(250);

	printk("new dri value = %d\n", dri);

	printk(KERN_DEBUG "new dri value = %d\n", dri);

#endif



	sdram_set_refresh(dri);
@@ -285,11 +287,10 @@ static int sa1110_target(struct cpufreq_policy *policy, 
	 * We wait 20ms to be safe.

	 */

	sdram_set_refresh(2);

	if (!irqs_disabled()) {

	if (!irqs_disabled())

		msleep(20);

	} else {

	else

		mdelay(20);

	}



	/*

	 * Reprogram the DRAM timings with interrupts disabled, and
@@ -356,7 +357,8 @@ static struct sdram_params *sa1110_find_sdram(const char *name) 
{

	struct sdram_params *sdram;



	for (sdram = sdram_tbl; sdram < sdram_tbl + ARRAY_SIZE(sdram_tbl); sdram++)

	for (sdram = sdram_tbl; sdram < sdram_tbl + ARRAY_SIZE(sdram_tbl);

	     sdram++)

		if (strcmp(name, sdram->name) == 0)

			return sdram;