[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>

authored by Peter Chubb and committed by Tony Luck 7b3166db 8b713c67

+10 -12
-1
arch/ia64/hp/sim/hpsim_console.c
··· 59 60 static struct tty_driver *simcons_console_device (struct console *c, int *index) 61 { 62 - extern struct tty_driver *hp_simserial_driver; 63 *index = c->index; 64 return hp_simserial_driver; 65 }
··· 59 60 static struct tty_driver *simcons_console_device (struct console *c, int *index) 61 { 62 *index = c->index; 63 return hp_simserial_driver; 64 }
+3 -9
arch/ia64/hp/sim/simeth.c
··· 22 #include <linux/bitops.h> 23 #include <asm/system.h> 24 #include <asm/irq.h> 25 26 #define SIMETH_RECV_MAX 10 27 ··· 37 */ 38 #define SIMETH_FRAME_SIZE ETH_FRAME_LEN 39 40 - 41 - #define SSC_NETDEV_PROBE 100 42 - #define SSC_NETDEV_SEND 101 43 - #define SSC_NETDEV_RECV 102 44 - #define SSC_NETDEV_ATTACH 103 45 - #define SSC_NETDEV_DETACH 104 46 47 #define NETWORK_INTR 8 48 ··· 120 121 return r; 122 } 123 - 124 - extern long ia64_ssc (long, long, long, long, int); 125 - extern void ia64_ssc_connect_irq (long intr, long irq); 126 127 static inline int 128 netdev_probe(char *name, unsigned char *ether)
··· 22 #include <linux/bitops.h> 23 #include <asm/system.h> 24 #include <asm/irq.h> 25 + #include <asm/hpsim.h> 26 + 27 + #include "hpsim_ssc.h" 28 29 #define SIMETH_RECV_MAX 10 30 ··· 34 */ 35 #define SIMETH_FRAME_SIZE ETH_FRAME_LEN 36 37 38 #define NETWORK_INTR 8 39 ··· 123 124 return r; 125 } 126 127 static inline int 128 netdev_probe(char *name, unsigned char *ether)
+1 -2
arch/ia64/hp/sim/simscsi.c
··· 14 #include <linux/kernel.h> 15 #include <linux/timer.h> 16 #include <asm/irq.h> 17 18 #include <scsi/scsi.h> 19 #include <scsi/scsi_cmnd.h> ··· 59 int fd; 60 unsigned count; 61 }; 62 - 63 - extern long ia64_ssc (long arg0, long arg1, long arg2, long arg3, int nr); 64 65 static int desc[16] = { 66 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
··· 14 #include <linux/kernel.h> 15 #include <linux/timer.h> 16 #include <asm/irq.h> 17 + #include "hpsim_ssc.h" 18 19 #include <scsi/scsi.h> 20 #include <scsi/scsi_cmnd.h> ··· 58 int fd; 59 unsigned count; 60 }; 61 62 static int desc[16] = { 63 -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1
+6
include/asm-ia64/hpsim.h
··· 7 int simcons_register(void); 8 #endif 9 10 #endif
··· 7 int simcons_register(void); 8 #endif 9 10 + struct tty_driver; 11 + extern struct tty_driver *hp_simserial_driver; 12 + 13 + void ia64_ssc_connect_irq(long intr, long irq); 14 + void ia64_ctl_trace(long on); 15 + 16 #endif