Skip to content

Commit

Permalink
[ARM] 3599/1: AT91RM9200 remove global variables
Browse files Browse the repository at this point in the history
Patch from Andrew Victor

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

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Andrew Victor authored and Russell King committed Jun 20, 2006
1 parent 5c3fddc commit 55c20c0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 22 deletions.
5 changes: 1 addition & 4 deletions arch/arm/mach-at91rm9200/clock.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
#include <asm/mach-types.h>

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

#include "generic.h"


/*
* There's a lot more which can be done with clocks, including cpufreq
* integration, slow clock mode support (for system suspend), letting
Expand Down Expand Up @@ -722,9 +722,6 @@ int __init at91_clock_init(unsigned long main_clock)
(unsigned) main_clock / 1000000,
((unsigned) main_clock % 1000000) / 1000);

/* FIXME get rid of master_clock global */
at91_master_clock = mck.rate_hz;

#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
/* establish PCK0..PCK3 parentage */
for (tmp = 0; tmp < ARRAY_SIZE(clock_list); tmp++) {
Expand Down
11 changes: 0 additions & 11 deletions arch/arm/mach-at91rm9200/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,3 @@ void __init at91rm9200_map_io(void)
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);
7 changes: 0 additions & 7 deletions include/asm-arm/arch-at91rm9200/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,6 @@
#ifndef __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/device.h>
#include <linux/spi/spi.h>
Expand Down

0 comments on commit 55c20c0

Please sign in to comment.