[PATCH] serial: omap: repair building without PM_SLEEP

[PATCH] serial: omap: repair building without PM_SLEEP

[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 <arnd@arndb.de>
---
Please apply for 3.10-rc

diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index 393a8eb..1aaeca8 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -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)

Re: [PATCH] serial: omap: repair building without PM_SLEEP

[Sourav Poddar]

Hi Arnd,
On Saturday 01 June 2013 02:48 PM, Arnd Bergmann wrote:
> 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<arnd@arndb.de>
> ---
> Please apply for 3.10-rc
>
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index 393a8eb..1aaeca8 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -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

Re: [PATCH] serial: omap: repair building without PM_SLEEP

[Greg Kroah-Hartman]

On Sat, Jun 01, 2013 at 11:18:13AM +0200, Arnd Bergmann wrote:
> 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?

> 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 <arnd@arndb.de>
> ---
> 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

Re: [PATCH] serial: omap: repair building without PM_SLEEP

[Arnd Bergmann]

On Monday 03 June 2013, Greg Kroah-Hartman wrote:
> On Sat, Jun 01, 2013 at 11:18:13AM +0200, Arnd Bergmann wrote:
> > 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?
> 
> > 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 <arnd@arndb.de>
> > ---
> > 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

Re: [PATCH] serial: omap: repair building without PM_SLEEP

[Kevin Hilman]

Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes:

> On Sat, Jun 01, 2013 at 11:18:13AM +0200, Arnd Bergmann wrote:
>> 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.)

>> 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 <arnd@arndb.de>

Acked-by: Kevin Hilman <khilman@linaro.org>

>> ---
>> 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