Commit f6de0c98 authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds
Browse files

Char: rocket, remove useless macros 



Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Acked-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 68562b79

drivers/char/rocket.c

+2 −9
Original line number Diff line number Diff line
@@ -40,12 +40,6 @@ 
 */



/****** Defines ******/

#ifdef PCI_NUM_RESOURCES

#define PCI_BASE_ADDRESS(dev, r) ((dev)->resource[r].start)

#else

#define PCI_BASE_ADDRESS(dev, r) ((dev)->base_address[r])

#endif



#define ROCKET_PARANOIA_CHECK

#define ROCKET_DISABLE_SIMUSAGE
@@ -981,7 +975,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp) 
	CHANNEL_t *cp;

	unsigned long page;



	line = TTY_GET_LINE(tty);

	line = tty->index;

	if ((line < 0) || (line >= MAX_RP_PORTS) || ((info = rp_table[line]) == NULL))

		return -ENXIO;
@@ -1166,8 +1160,7 @@ static void rp_close(struct tty_struct *tty, struct file *filp) 
	if (C_HUPCL(tty))

		sClrDTR(cp);



	if (TTY_DRIVER_FLUSH_BUFFER_EXISTS(tty))

		TTY_DRIVER_FLUSH_BUFFER(tty);

	rp_flush_buffer(tty);

		

	tty_ldisc_flush(tty);

drivers/char/rocket_int.h

+0 −18
Original line number Diff line number Diff line
@@ -105,12 +105,6 @@ static inline unsigned short sInW(unsigned short port) 
#define AIOPID_NULL -1		/* no AIOP or channel exists */

#define AIOPID_0001 0x0001	/* AIOP release 1 */



#define NULLDEV -1		/* identifies non-existant device */

#define NULLCTL -1		/* identifies non-existant controller */

#define NULLCTLPTR (CONTROLLER_T *)0	/* identifies non-existant controller */

#define NULLAIOP -1		/* identifies non-existant AIOP */

#define NULLCHAN -1		/* identifies non-existant channel */



/************************************************************************

 Global Register Offsets - Direct Access - Fixed values

************************************************************************/
@@ -1187,9 +1181,6 @@ struct r_port { 
#define ROCKET_CLOSING		0x40000000	/* Serial port is closing */

#define ROCKET_NORMAL_ACTIVE	0x20000000	/* Normal port is active */



/* tty subtypes */

#define SERIAL_TYPE_NORMAL 1



/*

 * Assigned major numbers for the Comtrol Rocketport

 */
@@ -1240,12 +1231,3 @@ struct r_port { 
/* Compact PCI device */ 

#define PCI_DEVICE_ID_CRP16INTF		0x0903	/* Rocketport Compact PCI 16 port w/external I/F */

#define TTY_GET_LINE(t) t->index

#define TTY_DRIVER_MINOR_START(t) t->driver->minor_start

#define TTY_DRIVER_SUBTYPE(t) t->driver->subtype

#define TTY_DRIVER_NAME(t) t->driver->name

#define TTY_DRIVER_NAME_BASE(t) t->driver->name_base

#define TTY_DRIVER_FLUSH_BUFFER_EXISTS(t) t->driver->flush_buffer

#define TTY_DRIVER_FLUSH_BUFFER(t) t->driver->flush_buffer(t)