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

Commit 55c20c0a authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[ARM] 3599/1: AT91RM9200 remove global variables 



Patch from Andrew Victor

This patch removes some now unnecessary global variables -
at91_master_clock, at91_serial_map, at91_console_port.

Signed-off-by: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5c3fddce

arch/arm/mach-at91rm9200/clock.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -28,10 +28,10 @@ 
#include <asm/mach-types.h>

#include <asm/mach-types.h>





#include <asm/arch/hardware.h>

#include <asm/arch/hardware.h>

#include <asm/arch/board.h>		/* for master clock global */





#include "generic.h"

#include "generic.h"







/*

/*

 * There's a lot more which can be done with clocks, including cpufreq

 * There's a lot more which can be done with clocks, including cpufreq

 * integration, slow clock mode support (for system suspend), letting

 * integration, slow clock mode support (for system suspend), letting
@@ -722,9 +722,6 @@ int __init at91_clock_init(unsigned long main_clock) 
		(unsigned) main_clock / 1000000,

		(unsigned) main_clock / 1000000,

		((unsigned) main_clock % 1000000) / 1000);

		((unsigned) main_clock % 1000000) / 1000);





	/* FIXME get rid of master_clock global */

	at91_master_clock = mck.rate_hz;



#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS

#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS

	/* establish PCK0..PCK3 parentage */

	/* establish PCK0..PCK3 parentage */

	for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) {

	for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) {

arch/arm/mach-at91rm9200/common.c

+0 −11
Original line number Original line Diff line number Diff line
@@ -108,14 +108,3 @@ void __init at91rm9200_map_io(void) 
	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));

	iotable_init(at91rm9200_io_desc, ARRAY_SIZE(at91rm9200_io_desc));

}

}



unsigned long at91_master_clock;



EXPORT_SYMBOL(at91_master_clock);





int at91_serial_map[AT91_NR_UART];

int at91_console_port;



EXPORT_SYMBOL(at91_serial_map);

EXPORT_SYMBOL(at91_console_port);

include/asm-arm/arch-at91rm9200/board.h

+0 −7
Original line number Original line Diff line number Diff line
@@ -31,13 +31,6 @@ 
#ifndef __ASM_ARCH_BOARD_H

#ifndef __ASM_ARCH_BOARD_H

#define __ASM_ARCH_BOARD_H

#define __ASM_ARCH_BOARD_H





 /* Clocks */

extern unsigned long at91_master_clock;



 /* Serial Port */

extern int at91_serial_map[AT91_NR_UART];

extern int at91_console_port;



#include <linux/mtd/partitions.h>

#include <linux/mtd/partitions.h>

#include <linux/device.h>

#include <linux/device.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>