diff mbox

[PATCHv5,1/2] driver: tty: serial: Move "uart_console" def to core header file.

Message ID 1367006686-3720-2-git-send-email-sourav.poddar@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Poddar, Sourav April 26, 2013, 8:04 p.m. UTC
Move "uart_console" definition to serial core header file, so that it can be
used by serial drivers.
Get rid of the uart_console defintion from mpc52xx_uart driver.

Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Felipe Balbi <balbi@ti.com>
Cc: Rajendra nayak <rnayak@ti.com>
Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
Reviewed-by: Felipe Balbi <balbi@ti.com>
---
 drivers/tty/serial/mpc52xx_uart.c |   10 ----------
 drivers/tty/serial/serial_core.c  |    6 ------
 include/linux/serial_core.h       |    7 +++++++
 3 files changed, 7 insertions(+), 16 deletions(-)

Comments

Greg Kroah-Hartman April 26, 2013, 10:18 p.m. UTC | #1
On Fri, Apr 26, 2013 at 03:03:07PM -0700, Kevin Hilman wrote:
> Hi Greg,
> 
> Sourav Poddar <sourav.poddar@ti.com> writes:
> 
> > Move "uart_console" definition to serial core header file, so that it can be
> > used by serial drivers.
> > Get rid of the uart_console defintion from mpc52xx_uart driver.
> >
> > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > Cc: Felipe Balbi <balbi@ti.com>
> > Cc: Rajendra nayak <rnayak@ti.com>
> > Signed-off-by: Sourav Poddar <sourav.poddar@ti.com>
> > Reviewed-by: Felipe Balbi <balbi@ti.com>
> 
> Can you queue up this patch (and 2/2)?  Once these are in, I will queue
> up the corresponding arch/arm changes which can go independently.
> 
> And feel free to add
> 
> Reviewed-by: Kevin Hilman <khilman@linaro.org>
> Tested-by: Kevin Hilman <khilman@linaro.org>

I will do so after 3.10-rc1 is out, it is _way_ too late in the
development cycle for me to add these to my trees right now, considering
they are pretty much closed at the moment.

thanks,

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Poddar, Sourav May 15, 2013, 2:43 p.m. UTC | #2
Hi Greg,
On Saturday 27 April 2013 03:48 AM, Greg KH wrote:
> On Fri, Apr 26, 2013 at 03:03:07PM -0700, Kevin Hilman wrote:
>> Hi Greg,
>>
>> Sourav Poddar<sourav.poddar@ti.com>  writes:
>>
>>> Move "uart_console" definition to serial core header file, so that it can be
>>> used by serial drivers.
>>> Get rid of the uart_console defintion from mpc52xx_uart driver.
>>>
>>> Cc: Santosh Shilimkar<santosh.shilimkar@ti.com>
>>> Cc: Felipe Balbi<balbi@ti.com>
>>> Cc: Rajendra nayak<rnayak@ti.com>
>>> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
>>> Reviewed-by: Felipe Balbi<balbi@ti.com>
>> Can you queue up this patch (and 2/2)?  Once these are in, I will queue
>> up the corresponding arch/arm changes which can go independently.
>>
>> And feel free to add
>>
>> Reviewed-by: Kevin Hilman<khilman@linaro.org>
>> Tested-by: Kevin Hilman<khilman@linaro.org>
> I will do so after 3.10-rc1 is out, it is _way_ too late in the
> development cycle for me to add these to my trees right now, considering
> they are pretty much closed at the moment.
>
Do you want me to rebase this patches on top of 3.10-rc1?
> thanks,
>
> greg k-h

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Greg Kroah-Hartman May 15, 2013, 2:57 p.m. UTC | #3
On Wed, May 15, 2013 at 08:13:09PM +0530, Sourav Poddar wrote:
> Hi Greg,
> On Saturday 27 April 2013 03:48 AM, Greg KH wrote:
> >On Fri, Apr 26, 2013 at 03:03:07PM -0700, Kevin Hilman wrote:
> >>Hi Greg,
> >>
> >>Sourav Poddar<sourav.poddar@ti.com>  writes:
> >>
> >>>Move "uart_console" definition to serial core header file, so that it can be
> >>>used by serial drivers.
> >>>Get rid of the uart_console defintion from mpc52xx_uart driver.
> >>>
> >>>Cc: Santosh Shilimkar<santosh.shilimkar@ti.com>
> >>>Cc: Felipe Balbi<balbi@ti.com>
> >>>Cc: Rajendra nayak<rnayak@ti.com>
> >>>Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
> >>>Reviewed-by: Felipe Balbi<balbi@ti.com>
> >>Can you queue up this patch (and 2/2)?  Once these are in, I will queue
> >>up the corresponding arch/arm changes which can go independently.
> >>
> >>And feel free to add
> >>
> >>Reviewed-by: Kevin Hilman<khilman@linaro.org>
> >>Tested-by: Kevin Hilman<khilman@linaro.org>
> >I will do so after 3.10-rc1 is out, it is _way_ too late in the
> >development cycle for me to add these to my trees right now, considering
> >they are pretty much closed at the moment.
> >
> Do you want me to rebase this patches on top of 3.10-rc1?

That would be great to have, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Poddar, Sourav May 15, 2013, 2:57 p.m. UTC | #4
On Wednesday 15 May 2013 08:27 PM, Greg KH wrote:
> On Wed, May 15, 2013 at 08:13:09PM +0530, Sourav Poddar wrote:
>> Hi Greg,
>> On Saturday 27 April 2013 03:48 AM, Greg KH wrote:
>>> On Fri, Apr 26, 2013 at 03:03:07PM -0700, Kevin Hilman wrote:
>>>> Hi Greg,
>>>>
>>>> Sourav Poddar<sourav.poddar@ti.com>   writes:
>>>>
>>>>> Move "uart_console" definition to serial core header file, so that it can be
>>>>> used by serial drivers.
>>>>> Get rid of the uart_console defintion from mpc52xx_uart driver.
>>>>>
>>>>> Cc: Santosh Shilimkar<santosh.shilimkar@ti.com>
>>>>> Cc: Felipe Balbi<balbi@ti.com>
>>>>> Cc: Rajendra nayak<rnayak@ti.com>
>>>>> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
>>>>> Reviewed-by: Felipe Balbi<balbi@ti.com>
>>>> Can you queue up this patch (and 2/2)?  Once these are in, I will queue
>>>> up the corresponding arch/arm changes which can go independently.
>>>>
>>>> And feel free to add
>>>>
>>>> Reviewed-by: Kevin Hilman<khilman@linaro.org>
>>>> Tested-by: Kevin Hilman<khilman@linaro.org>
>>> I will do so after 3.10-rc1 is out, it is _way_ too late in the
>>> development cycle for me to add these to my trees right now, considering
>>> they are pretty much closed at the moment.
>>>
>> Do you want me to rebase this patches on top of 3.10-rc1?
> That would be great to have, thanks.
>
> greg k-h
Ok. Will do that and resend.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Poddar, Sourav May 15, 2013, 3:43 p.m. UTC | #5
Hi,
On Wednesday 15 May 2013 08:27 PM, Sourav Poddar wrote:
> On Wednesday 15 May 2013 08:27 PM, Greg KH wrote:
>> On Wed, May 15, 2013 at 08:13:09PM +0530, Sourav Poddar wrote:
>>> Hi Greg,
>>> On Saturday 27 April 2013 03:48 AM, Greg KH wrote:
>>>> On Fri, Apr 26, 2013 at 03:03:07PM -0700, Kevin Hilman wrote:
>>>>> Hi Greg,
>>>>>
>>>>> Sourav Poddar<sourav.poddar@ti.com>   writes:
>>>>>
>>>>>> Move "uart_console" definition to serial core header file, so 
>>>>>> that it can be
>>>>>> used by serial drivers.
>>>>>> Get rid of the uart_console defintion from mpc52xx_uart driver.
>>>>>>
>>>>>> Cc: Santosh Shilimkar<santosh.shilimkar@ti.com>
>>>>>> Cc: Felipe Balbi<balbi@ti.com>
>>>>>> Cc: Rajendra nayak<rnayak@ti.com>
>>>>>> Signed-off-by: Sourav Poddar<sourav.poddar@ti.com>
>>>>>> Reviewed-by: Felipe Balbi<balbi@ti.com>
>>>>> Can you queue up this patch (and 2/2)?  Once these are in, I will 
>>>>> queue
>>>>> up the corresponding arch/arm changes which can go independently.
>>>>>
>>>>> And feel free to add
>>>>>
>>>>> Reviewed-by: Kevin Hilman<khilman@linaro.org>
>>>>> Tested-by: Kevin Hilman<khilman@linaro.org>
>>>> I will do so after 3.10-rc1 is out, it is _way_ too late in the
>>>> development cycle for me to add these to my trees right now, 
>>>> considering
>>>> they are pretty much closed at the moment.
>>>>
>>> Do you want me to rebase this patches on top of 3.10-rc1?
>> That would be great to have, thanks.
>>
[Greg]:
            Have resend the patch series based on 3.10-rc1.

[Kevin]: Should I resend the omap specific changes also after rebasing it on
              3.10-rc1, once greg pull in the serial part. ?
>> greg k-h
> Ok. Will do that and resend.
> -- 
> To unsubscribe from this list: send the line "unsubscribe 
> linux-serial" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

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

Patch

diff --git a/drivers/tty/serial/mpc52xx_uart.c b/drivers/tty/serial/mpc52xx_uart.c
index 018bad9..d74ac06 100644
--- a/drivers/tty/serial/mpc52xx_uart.c
+++ b/drivers/tty/serial/mpc52xx_uart.c
@@ -84,16 +84,6 @@  static void mpc52xx_uart_of_enumerate(void);
 static irqreturn_t mpc52xx_uart_int(int irq, void *dev_id);
 static irqreturn_t mpc5xxx_uart_process_int(struct uart_port *port);
 
-
-/* Simple macro to test if a port is console or not. This one is taken
- * for serial_core.c and maybe should be moved to serial_core.h ? */
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
-#define uart_console(port) \
-	((port)->cons && (port)->cons->index == (port)->line)
-#else
-#define uart_console(port)	(0)
-#endif
-
 /* ======================================================================== */
 /* PSC fifo operations for isolating differences between 52xx and 512x      */
 /* ======================================================================== */
diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
index a400002..b5f74bf 100644
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
@@ -50,12 +50,6 @@  static struct lock_class_key port_lock_key;
 
 #define HIGH_BITS_OFFSET	((sizeof(long)-sizeof(int))*8)
 
-#ifdef CONFIG_SERIAL_CORE_CONSOLE
-#define uart_console(port)	((port)->cons && (port)->cons->index == (port)->line)
-#else
-#define uart_console(port)	(0)
-#endif
-
 static void uart_change_speed(struct tty_struct *tty, struct uart_state *state,
 					struct ktermios *old_termios);
 static void uart_wait_until_sent(struct tty_struct *tty, int timeout);
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 87d4bbc..b98291a 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -31,6 +31,13 @@ 
 #include <linux/sysrq.h>
 #include <uapi/linux/serial_core.h>
 
+#ifdef CONFIG_SERIAL_CORE_CONSOLE
+#define uart_console(port) \
+	((port)->cons && (port)->cons->index == (port)->line)
+#else
+#define uart_console(port)      (0)
+#endif
+
 struct uart_port;
 struct serial_struct;
 struct device;