Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d37c6ceb authored by Felipe Balbi's avatar Felipe Balbi Committed by Greg Kroah-Hartman
Browse files

serial: omap: move uart_omap_port definition to C file 



nobody needs to access the uart_omap_port structure
other than omap-serial.c file. Let's move that
structure definition to the C source file in order
to prevent anyone from accessing our structure.

Tested-by: default avatarShubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d21e4005

arch/arm/plat-omap/include/plat/omap-serial.h

+0 −37
Original line number Diff line number Diff line
@@ -105,45 +105,8 @@ struct uart_omap_dma { 
	unsigned int		rx_timeout;

};



struct uart_omap_port {

	struct uart_port	port;

	struct uart_omap_dma	uart_dma;

	struct device		*dev;



	unsigned char		ier;

	unsigned char		lcr;

	unsigned char		mcr;

	unsigned char		fcr;

	unsigned char		efr;

	unsigned char		dll;

	unsigned char		dlh;

	unsigned char		mdr1;

	unsigned char		scr;



	int			use_dma;

	/*

	 * Some bits in registers are cleared on a read, so they must

	 * be saved whenever the register is read but the bits will not

	 * be immediately processed.

	 */

	unsigned int		lsr_break_flag;

	unsigned char		msr_saved_flags;

	char			name[20];

	unsigned long		port_activity;

	u32			context_loss_cnt;

	u32			errata;

	u8			wakeups_enabled;



	int			DTR_gpio;

	int			DTR_inverted;

	int			DTR_active;



	struct pm_qos_request	pm_qos_request;

	u32			latency;

	u32			calc_latency;

	struct work_struct	qos_work;

};



#define to_uart_omap_port(p)	((container_of((p), struct uart_omap_port, port)))



#endif /* __OMAP_SERIAL_H__ */

drivers/tty/serial/omap-serial.c

+38 −0
Original line number Diff line number Diff line
@@ -70,6 +70,44 @@ 
#define OMAP_UART_MVR_MAJ_SHIFT		8

#define OMAP_UART_MVR_MIN_MASK		0x3f



struct uart_omap_port {

	struct uart_port	port;

	struct uart_omap_dma	uart_dma;

	struct device		*dev;



	unsigned char		ier;

	unsigned char		lcr;

	unsigned char		mcr;

	unsigned char		fcr;

	unsigned char		efr;

	unsigned char		dll;

	unsigned char		dlh;

	unsigned char		mdr1;

	unsigned char		scr;



	int			use_dma;

	/*

	 * Some bits in registers are cleared on a read, so they must

	 * be saved whenever the register is read but the bits will not

	 * be immediately processed.

	 */

	unsigned int		lsr_break_flag;

	unsigned char		msr_saved_flags;

	char			name[20];

	unsigned long		port_activity;

	u32			context_loss_cnt;

	u32			errata;

	u8			wakeups_enabled;

	unsigned int		irq_pending:1;



	struct pm_qos_request	pm_qos_request;

	u32			latency;

	u32			calc_latency;

	struct work_struct	qos_work;

};



#define to_uart_omap_port(p)	((container_of((p), struct uart_omap_port, port)))



static struct uart_omap_port *ui[OMAP_MAX_HSUART_PORTS];



/* Forward declaration of functions */