tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Char: rocket, remove useless macros

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Acked-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jiri Slaby and committed by
Linus Torvalds f6de0c98 68562b79

+2 -27
+2 -9
drivers/char/rocket.c
··· 40 40 */ 41 41 42 42 /****** Defines ******/ 43 - #ifdef PCI_NUM_RESOURCES 44 - #define PCI_BASE_ADDRESS(dev, r) ((dev)->resource[r].start) 45 - #else 46 - #define PCI_BASE_ADDRESS(dev, r) ((dev)->base_address[r]) 47 - #endif 48 - 49 43 #define ROCKET_PARANOIA_CHECK 50 44 #define ROCKET_DISABLE_SIMUSAGE 51 45 ··· 975 981 CHANNEL_t *cp; 976 982 unsigned long page; 977 983 978 - line = TTY_GET_LINE(tty); 984 + line = tty->index; 979 985 if ((line < 0) || (line >= MAX_RP_PORTS) || ((info = rp_table[line]) == NULL)) 980 986 return -ENXIO; 981 987 ··· 1160 1166 if (C_HUPCL(tty)) 1161 1167 sClrDTR(cp); 1162 1168 1163 - if (TTY_DRIVER_FLUSH_BUFFER_EXISTS(tty)) 1164 - TTY_DRIVER_FLUSH_BUFFER(tty); 1169 + rp_flush_buffer(tty); 1165 1170 1166 1171 tty_ldisc_flush(tty); 1167 1172
-18
drivers/char/rocket_int.h
··· 105 105 #define AIOPID_NULL -1 /* no AIOP or channel exists */ 106 106 #define AIOPID_0001 0x0001 /* AIOP release 1 */ 107 107 108 - #define NULLDEV -1 /* identifies non-existant device */ 109 - #define NULLCTL -1 /* identifies non-existant controller */ 110 - #define NULLCTLPTR (CONTROLLER_T *)0 /* identifies non-existant controller */ 111 - #define NULLAIOP -1 /* identifies non-existant AIOP */ 112 - #define NULLCHAN -1 /* identifies non-existant channel */ 113 - 114 108 /************************************************************************ 115 109 Global Register Offsets - Direct Access - Fixed values 116 110 ************************************************************************/ ··· 1181 1187 #define ROCKET_CLOSING 0x40000000 /* Serial port is closing */ 1182 1188 #define ROCKET_NORMAL_ACTIVE 0x20000000 /* Normal port is active */ 1183 1189 1184 - /* tty subtypes */ 1185 - #define SERIAL_TYPE_NORMAL 1 1186 - 1187 1190 /* 1188 1191 * Assigned major numbers for the Comtrol Rocketport 1189 1192 */ ··· 1230 1239 1231 1240 /* Compact PCI device */ 1232 1241 #define PCI_DEVICE_ID_CRP16INTF 0x0903 /* Rocketport Compact PCI 16 port w/external I/F */ 1233 - 1234 - #define TTY_GET_LINE(t) t->index 1235 - #define TTY_DRIVER_MINOR_START(t) t->driver->minor_start 1236 - #define TTY_DRIVER_SUBTYPE(t) t->driver->subtype 1237 - #define TTY_DRIVER_NAME(t) t->driver->name 1238 - #define TTY_DRIVER_NAME_BASE(t) t->driver->name_base 1239 - #define TTY_DRIVER_FLUSH_BUFFER_EXISTS(t) t->driver->flush_buffer 1240 - #define TTY_DRIVER_FLUSH_BUFFER(t) t->driver->flush_buffer(t) 1241 - 1242 1242