Two trivial omap/serial patches

PATCH New NeilBrown 4 participants 8 messages Feb 19, 2012 – Feb 21, 2012

Subsystems (5)

Arm (32-bit) Arm sub-architectures TTY layer and serial drivers OMAP2+ support +1 more subsystems

lore

Share & tools

lore

NeilBrown

author

2012-02-19 02:29 UTC #0 lore raw

cover Two trivial omap/serial patches

Just a couple of small clean-ups following the recent major changes.

Thanks,
NeilBrown

---

NeilBrown (2):
ARM: OMAP2: remove some orphan function declarations.
ARM: OMAP2+: UART: remove unused fields in omap_uart_state.

 arch/arm/mach-omap2/pm.h                 |    1 -
 arch/arm/mach-omap2/serial.c             |    4 ----
 arch/arm/plat-omap/include/plat/serial.h |    1 -
 3 files changed, 0 insertions(+), 6 deletions(-)

Signature · 1 line

Signature

NeilBrown

author

2012-02-19 02:29 UTC #1 lore raw

PATCH 1/2 ARM: OMAP2+: UART: remove unused fields in omap_uart_state.

commit 2fd149645eb46d261 removed the last usage of 'can_sleep' but did not remove the field.
commit 8612bd22f3036974 removed the last non-trivial use of 'pdev'.

So remove these fields and the one trivial use.

Acked-by Govindraj.R <[email protected]>

Signed-off-by NeilBrown <[email protected]>

---

 arch/arm/mach-omap2/serial.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

arch/arm/mach-omap2/serial.c +0 -4

index f590afc..0cdd359 100644
@@ -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)

Sergei Shtylyov

2012-02-19 16:10 UTC #2 lore raw

PATCH 1/2 ARM: OMAP2+: UART: remove unused fields in omap_uart_state.

Hello.

Quoted 3 lines · NeilBrown

commit 2fd149645eb46d261 removed the last usage of 'can_sleep' but did not remove the field.
commit 8612bd22f3036974 removed the last non-trivial use of 'pdev'.

Please also specify the summaries of the above commits with them.

Quoted 1 line

So remove these fields and the one trivial use.

This seems like the material for 2 patches.

Quoted 2 lines

Acked-by Govindraj.R <[email protected]>
Signed-off-by NeilBrown <[email protected]>

WBR, Sergei

NeilBrown

author

2012-02-19 02:29 UTC #3 lore raw

PATCH 2/2 ARM: OMAP2: remove some orphan function declarations.

In reply to NeilBrown

commit 2fd149645eb removed omap_uart_can_sleep and omap3_can_sleep, but not their declarations. So remove those now.

Signed-off-by NeilBrown <[email protected]>

---

 arch/arm/mach-omap2/pm.h                 |    1 -
 arch/arm/plat-omap/include/plat/serial.h |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

arch/arm/mach-omap2/pm.h +0 -1

index b737b11..6cd954d 100644
@@ -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/plat-omap/include/plat/serial.h +0 -1

index 198d1e6..b073e5f 100644
@@ -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);

Shubhrajyoti

2012-02-19 13:36 UTC #4 lore raw

PATCH 2/2 ARM: OMAP2: remove some orphan function declarations.

Quoted 3 lines · NeilBrown

commit 2fd149645eb removed omap_uart_can_sleep and omap3_can_sleep, but not their declarations. So remove those now.

a small description with the commit id would have been good.

Looks good to me.

Reviewed-by Shubhrajyoti D <[email protected]>

thanks.

Quoted 37 lines

Signed-off-by NeilBrown <[email protected]>

---

 arch/arm/mach-omap2/pm.h                 |    1 -
 arch/arm/plat-omap/include/plat/serial.h |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

arch/arm/mach-omap2/pm.h +0 -1

index b737b11..6cd954d 100644
@@ -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/plat-omap/include/plat/serial.h +0 -2

index 198d1e6..b073e5f 100644
@@ -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);
 
 
--

To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Sergei Shtylyov

2012-02-19 16:09 UTC #5 lore raw

PATCH 2/2 ARM: OMAP2: remove some orphan function declarations.

In reply to NeilBrown

Hello.

Quoted 1 line · NeilBrown

commit 2fd149645eb

Please also specify that commit's summary in parens.

Quoted 4 lines

removed omap_uart_can_sleep and omap3_can_sleep,
but not their declarations. So remove those now.
Signed-off-by NeilBrown <[email protected]>

WBR, Sergei

Kevin Hilman

2012-02-21 19:10 UTC #6 lore raw

cover Two trivial omap/serial patches

In reply to NeilBrown

Quoted 1 line · NeilBrown

Just a couple of small clean-ups following the recent major changes.

Thanks Neil.

I'll queue these as cleanups for v3.4 since I dont' think they're v3.3 material at this point of the cycle.

I'll also update the changelogs to follow the practice of adding the shortlog in parens after the commit ID.

Kevin

Quoted 15 lines

Thanks,
NeilBrown
---
NeilBrown (2):
ARM: OMAP2: remove some orphan function declarations.
ARM: OMAP2+: UART: remove unused fields in omap_uart_state.
 arch/arm/mach-omap2/pm.h                 |    1 -
 arch/arm/mach-omap2/serial.c             |    4 ----
 arch/arm/plat-omap/include/plat/serial.h |    1 -
 3 files changed, 0 insertions(+), 6 deletions(-)

NeilBrown

author

2012-02-21 19:40 UTC #7 lore raw

cover Two trivial omap/serial patches

Quoted 8 lines · On Tue, 21 Feb 2012 11:10:30 -0800 Kevin Hilman <[email protected]> wrote:

Quoted 1 line · NeilBrown
Just a couple of small clean-ups following the recent major changes.
Thanks Neil.
I'll queue these as cleanups for v3.4 since I dont' think they're v3.3 material at this point of the cycle.

Thanks,

Quoted 3 lines

I'll also update the changelogs to follow the practice of adding the shortlog in parens after the commit ID.

I'll try to remember that for next time.

Thanks,
NeilBrown
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 828 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120222/c548e47e/attachment.sig>