From 867e9f8d105004de85335414ab09e99338617e03 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sun, 19 Feb 2012 13:29:31 +1100 Subject: [PATCH 1/2] ARM: OMAP2+: UART: remove unused fields in omap_uart_state. commit 2fd149645eb46d261 (ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos) removed the last usage of 'can_sleep' but did not remove the field. commit 8612bd22f3036974 (ARM: OMAP2+: UART: Avoid console uart idling during bootup) removed the last non-trivial use of 'pdev'. So remove these fields and the one trivial use. Acked-by: Govindraj.R Signed-off-by: NeilBrown [khilman@ti.com: minor changelog edits] Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/serial.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c index f590afc1f673..0cdd359a128e 100644 --- a/arch/arm/mach-omap2/serial.c +++ b/arch/arm/mach-omap2/serial.c @@ -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) From 7cb034f8179dfc2889c1f2341566ee68f648a324 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sun, 19 Feb 2012 13:29:31 +1100 Subject: [PATCH 2/2] ARM: OMAP2+: remove some orphan function declarations. commit 2fd149645eb (ARM: OMAP2+: UART: Remove omap_uart_can_sleep and add pm_qos) removed omap_uart_can_sleep and omap3_can_sleep, but not their declarations. So remove those now. Signed-off-by: NeilBrown Reviewed-by: Shubhrajyoti D [khilman@ti.com: minor changelog edits] Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/pm.h | 1 - arch/arm/plat-omap/include/plat/serial.h | 1 - 2 files changed, 2 deletions(-) diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h index b737b11e4499..6cd954dd189f 100644 --- a/arch/arm/mach-omap2/pm.h +++ b/arch/arm/mach-omap2/pm.h @@ -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); diff --git a/arch/arm/plat-omap/include/plat/serial.h b/arch/arm/plat-omap/include/plat/serial.h index 198d1e6a4a6c..b073e5f2b190 100644 --- a/arch/arm/plat-omap/include/plat/serial.h +++ b/arch/arm/plat-omap/include/plat/serial.h @@ -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);