lkml.org 
[lkml]   [2012]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 44/68] TTY: simserial no longer needs serialP
    Date
    Let's do a spin-off of serial_state structure with only needed
    elements.

    And remove serialP crap from includes.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: Fenghua Yu <fenghua.yu@intel.com>
    ---
    arch/ia64/hp/sim/simserial.c | 9 ++++++++-
    include/linux/serialP.h | 2 --
    2 files changed, 8 insertions(+), 3 deletions(-)

    diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
    index 3698a2f..120aad4 100644
    --- a/arch/ia64/hp/sim/simserial.c
    +++ b/arch/ia64/hp/sim/simserial.c
    @@ -27,10 +27,10 @@
    #include <linux/seq_file.h>
    #include <linux/slab.h>
    #include <linux/capability.h>
    +#include <linux/circ_buf.h>
    #include <linux/console.h>
    #include <linux/module.h>
    #include <linux/serial.h>
    -#include <linux/serialP.h>
    #include <linux/sysrq.h>

    #include <asm/irq.h>
    @@ -46,6 +46,13 @@

    #define NR_PORTS 1 /* only one port for now */

    +struct serial_state {
    + struct tty_port tport;
    + struct circ_buf xmit;
    + int irq;
    + int x_char;
    +};
    +
    static char *serial_name = "SimSerial driver";
    static char *serial_version = "0.6";

    diff --git a/include/linux/serialP.h b/include/linux/serialP.h
    index e5e8442..9a04dec 100644
    --- a/include/linux/serialP.h
    +++ b/include/linux/serialP.h
    @@ -44,10 +44,8 @@ struct serial_state {
    int quot;
    int IER; /* Interrupt Enable Register */
    int MCR; /* Modem control register */
    - /* simserial */
    int x_char; /* xon/xoff character */
    struct circ_buf xmit;
    - /* /simserial */
    /* /amiserial */
    };

    --
    1.7.9.2



    \
     
     \ /
      Last update: 2012-03-05 15:13    [W:0.020 / U:37.308 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site