Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

+6 -6
+6 -6
drivers/sbus/char/aurora.c
··· 124 */ 125 126 /* Get board number from pointer */ 127 - extern inline int board_No (struct Aurora_board const * bp) 128 { 129 return bp - aurora_board; 130 } 131 132 /* Get port number from pointer */ 133 - extern inline int port_No (struct Aurora_port const * port) 134 { 135 return AURORA_PORT(port - aurora_port); 136 } 137 138 /* Get pointer to board from pointer to port */ 139 - extern inline struct Aurora_board * port_Board(struct Aurora_port const * port) 140 { 141 return &aurora_board[AURORA_BOARD(port - aurora_port)]; 142 } 143 144 /* Wait for Channel Command Register ready */ 145 - extern inline void aurora_wait_CCR(struct aurora_reg128 * r) 146 { 147 unsigned long delay; 148 ··· 161 */ 162 163 /* Must be called with enabled interrupts */ 164 - extern inline void aurora_long_delay(unsigned long delay) 165 { 166 unsigned long i; 167 ··· 420 sbus_iounmap((unsigned long)bp->r3, 4); 421 } 422 423 - extern inline void aurora_mark_event(struct Aurora_port * port, int event) 424 { 425 #ifdef AURORA_DEBUG 426 printk("aurora_mark_event: start\n");
··· 124 */ 125 126 /* Get board number from pointer */ 127 + static inline int board_No (struct Aurora_board const * bp) 128 { 129 return bp - aurora_board; 130 } 131 132 /* Get port number from pointer */ 133 + static inline int port_No (struct Aurora_port const * port) 134 { 135 return AURORA_PORT(port - aurora_port); 136 } 137 138 /* Get pointer to board from pointer to port */ 139 + static inline struct Aurora_board * port_Board(struct Aurora_port const * port) 140 { 141 return &aurora_board[AURORA_BOARD(port - aurora_port)]; 142 } 143 144 /* Wait for Channel Command Register ready */ 145 + static inline void aurora_wait_CCR(struct aurora_reg128 * r) 146 { 147 unsigned long delay; 148 ··· 161 */ 162 163 /* Must be called with enabled interrupts */ 164 + static inline void aurora_long_delay(unsigned long delay) 165 { 166 unsigned long i; 167 ··· 420 sbus_iounmap((unsigned long)bp->r3, 4); 421 } 422 423 + static inline void aurora_mark_event(struct Aurora_port * port, int event) 424 { 425 #ifdef AURORA_DEBUG 426 printk("aurora_mark_event: start\n");