Commit 86ca5b6f authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'uart' of... 

Merge branch 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

* 'uart' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: remove some orphan function declarations.
  ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
parents e65bc891 dd713e97

arch/arm/mach-omap2/pm.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
extern void *omap3_secure_ram_storage;

extern void omap3_pm_off_mode_enable(int);

extern void omap_sram_idle(void);

extern int omap3_can_sleep(void);

extern int omap_set_pwrdm_state(struct powerdomain *pwrdm, u32 state);

extern int omap3_idle_init(void);

extern int omap4_idle_init(void);

arch/arm/mach-omap2/serial.c

+0 −4
Original line number Diff line number Diff line
@@ -54,11 +54,9 @@ 


struct omap_uart_state {

	int num;

	int can_sleep;



	struct list_head node;

	struct omap_hwmod *oh;

	struct platform_device *pdev;

};



static LIST_HEAD(uart_list);
@@ -381,8 +379,6 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, 


	oh->mux = omap_hwmod_mux_init(bdata->pads, bdata->pads_cnt);



	uart->pdev = pdev;



	oh->dev_attr = uart;



	if (((cpu_is_omap34xx() || cpu_is_omap44xx()) && bdata->pads)

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

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ struct omap_board_data; 
struct omap_uart_port_info;



extern void omap_serial_init(void);

extern int omap_uart_can_sleep(void);

extern void omap_serial_board_init(struct omap_uart_port_info *platform_data);

extern void omap_serial_init_port(struct omap_board_data *bdata,

		struct omap_uart_port_info *platform_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE