serial: omap: repair building without PM_SLEEP

PATCH In review Arnd Bergmann 4 participants 5 messages Jun 1, 2013 – Jun 3, 2013 TTY layer and serial drivers

Share & tools

Arnd Bergmann

author

2013-06-01 09:18 UTC #0 lore raw

PATCH 1/1 serial: omap: repair building without PM_SLEEP

A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for "no_console_suspend"", introduced a regression from an obvious typo:

drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)

This changes the incorrectly added macro to the one that we need instead.

Signed-off-by Arnd Bergmann <[email protected]>

---
Please apply for 3.10-rc

drivers/tty/serial/omap-serial.c +1 -1

index 393a8eb..1aaeca8 100644
@@ -1326,7 +1326,7 @@ static int serial_omap_resume(struct device *dev)
 }
 #else
 #define serial_omap_prepare NULL
-#define serial_omap_prepare NULL
+#define serial_omap_complete NULL
 #endif /* CONFIG_PM_SLEEP */
 
 static void omap_serial_fill_features_erratas(struct uart_omap_port *up)

Sourav Poddar

2013-06-01 11:48 UTC #1 lore raw

Hi Arnd,

Quoted 18 lines · Arnd Bergmann

A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for "no_console_suspend"", introduced a regression from an obvious typo:
drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)
This changes the incorrectly added macro to the one that we need instead.
Signed-off-by Arnd Bergmann<[email protected]>
---
Please apply for 3.10-rc
drivers/tty/serial/omap-serial.c +0 -0
index 393a8eb..1aaeca8 100644

drivers/tty/serial/omap-serial.c static int serial_omap_resume(struct device *dev) · line 1332

Quoted 8 lines

drivers/tty/serial/omap-serial.c +1 -1

@@ -1326,7 +1326,7 @@ static int serial_omap_resume(struct device *dev)
  }
  #else
  #define serial_omap_prepare NULL
-#define serial_omap_prepare NULL
+#define serial_omap_complete NULL
  #endif /* CONFIG_PM_SLEEP */
 
  static void omap_serial_fill_features_erratas(struct uart_omap_port *up)

Yes, this bug was noticed last week and a patch for it has already been posted to the
serial mailing list[1].
[1]: http://www.spinics.net/lists/linux-serial/msg09741.html

Greg Kroah-Hartman

maintainer

2013-06-03 17:07 UTC #2 lore raw

In reply to Arnd Bergmann

Quoted 2 lines · Arnd Bergmann

A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for "no_console_suspend"", introduced a regression from an obvious typo:

I don't see that commit id, or commit, in Linus's tree at all. Where do you see it?

Quoted 8 lines

drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)
This changes the incorrectly added macro to the one that we need instead.
Signed-off-by Arnd Bergmann <[email protected]>
---
Please apply for 3.10-rc

Really? It doesn't apply to 3.10-rc3 or -rc4 from what I can tell.

confused,

greg k-h

Arnd Bergmann

author

2013-06-03 18:43 UTC #3 lore raw

Quoted 10 lines · Greg Kroah-Hartman

Quoted 2 lines · Arnd Bergmann
A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for "no_console_suspend"", introduced a regression from an obvious typo:
I don't see that commit id, or commit, in Linus's tree at all. Where do you see it?
Quoted 3 lines
drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)

Quoted 7 lines

Quoted 5 lines
This changes the incorrectly added macro to the one that we need instead.
Signed-off-by Arnd Bergmann <[email protected]>
---
Please apply for 3.10-rc
Really? It doesn't apply to 3.10-rc3 or -rc4 from what I can tell.

Sorry, my mistake. Since the bug was introduced as part of a bug fix I assumed it was in 3.10-rc but did not look carefully. The problem only exists in tty-next at the moment.

Arnd

Kevin Hilman

Acked-by

2013-06-03 18:50 UTC #4 lore raw

In reply to Greg Kroah-Hartman

Quoted 6 lines · Greg Kroah-Hartman

Quoted 2 lines · Arnd Bergmann
A recent bug fix in 3.10, ddd85e225c "serial: omap: prevent runtime PM for "no_console_suspend"", introduced a regression from an obvious typo:
I don't see that commit id, or commit, in Linus's tree at all. Where do you see it?

It's in linux-next (from your tty-next branch.)

Quoted 6 lines

Quoted 6 lines
drivers/tty/serial/omap-serial.c:1677:14: error: 'serial_omap_complete'
undeclared here (not in a function)
This changes the incorrectly added macro to the one that we need instead.
Signed-off-by Arnd Bergmann <[email protected]>

Acked-by Kevin Hilman <[email protected]>

Quoted 4 lines

Quoted 2 lines
---
Please apply for 3.10-rc
Really? It doesn't apply to 3.10-rc3 or -rc4 from what I can tell.

Right, this is -next material, not v3.10.

Kevin