diff options
| author | Peter Chubb <peterc@gelato.unsw.edu.au> | 2007-08-21 13:57:01 +1000 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-09-01 02:52:25 -0700 |
| commit | 7b3166dbc3df5b72f2ba4ea130f4461e318a3838 (patch) | |
| tree | ef93805e4321adf8f3994e749894ab3451e7cab4 /arch/ia64 | |
| parent | 8b713c67bccef7cabb0ee915f47eb33d82636af9 (diff) | |
[IA64] Cleanup HPSIM code (was: Re: Enable early console for Ski simulator)
After my last patch we have a new header file for HP simulator use.
Here's code to use it for stuff that used to have `extern' statements
inline in the code. Functionality should not change with this patch.
Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/hp/sim/hpsim_console.c | 1 | ||||
| -rw-r--r-- | arch/ia64/hp/sim/simeth.c | 12 | ||||
| -rw-r--r-- | arch/ia64/hp/sim/simscsi.c | 3 |
3 files changed, 4 insertions, 12 deletions
diff --git a/arch/ia64/hp/sim/hpsim_console.c b/arch/ia64/hp/sim/hpsim_console.c index 0475a545240..01663bc42b1 100644 --- a/arch/ia64/hp/sim/hpsim_console.c +++ b/arch/ia64/hp/sim/hpsim_console.c @@ -59,7 +59,6 @@ simcons_write (struct console *cons, const char *buf, unsigned count) static struct tty_driver *simcons_console_device (struct console *c, int *index) { - extern struct tty_driver *hp_simserial_driver; *index = c->index; return hp_simserial_driver; } diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c index f26077a773d..4017696ada6 100644 --- a/arch/ia64/hp/sim/simeth.c +++ b/arch/ia64/hp/sim/simeth.c @@ -22,6 +22,9 @@ #include <linux/bitops.h> #include <asm/system.h> #include <asm/irq.h> +#include <asm/hpsim.h> + +#include "hpsim_ssc.h" #define SIMETH_RECV_MAX 10 @@ -35,12 +38,6 @@ #define SIMETH_FRAME_SIZE ETH_FRAME_LEN -#define SSC_NETDEV_PROBE 100 -#define SSC_NETDEV_SEND 101 -#define SSC_NETDEV_RECV 102 -#define SSC_NETDEV_ATTACH 103 -#define SSC_NETDEV_DETACH 104 - #define NETWORK_INTR 8 struct simeth_local { @@ -124,9 +121,6 @@ simeth_probe (void) return r; } -extern long ia64_ssc (long, long, long, long, int); -extern void ia64_ssc_connect_irq (long intr, long irq); - static inline int netdev_probe(char *name, unsigned char *ether) { diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c index e62694f8ef7..4552a1cf5b3 100644 --- a/arch/ia64/hp/sim/simscsi.c +++ b/arch/ia64/hp/sim/simscsi.c @@ -14,6 +14,7 @@ #include <linux/kernel.h> #include <linux/timer.h> #include <asm/irq.h> +#include "hpsim_ssc.h" #include <scsi/scsi.h> #include <scsi/scsi_cmnd.h> @@ -59,8 +60,6 @@ struct disk_stat { unsigned count; }; -extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr); - static int desc[16] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 }; |