lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/8] usb: gadget: u_serial: propagate ioctl() to the next layer
    Date
    In order for a serial function to implement its own ioctl() calls,
    propagate the ioctl() callback to the next layer so it can handle it if
    it sees fit to do so.

    Signed-off-by: Tal Shorer <tal.shorer@gmail.com>
    ---
    drivers/usb/gadget/function/u_serial.c | 15 +++++++++++++++
    drivers/usb/gadget/function/u_serial.h | 1 +
    2 files changed, 16 insertions(+)

    diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
    index d466f58..8d9abf1 100644
    --- a/drivers/usb/gadget/function/u_serial.c
    +++ b/drivers/usb/gadget/function/u_serial.c
    @@ -1040,6 +1040,20 @@ static unsigned int gs_poll(struct tty_struct *tty, struct file *file,
    return mask;
    }

    +static int gs_ioctl(struct tty_struct *tty, unsigned int cmd, unsigned long arg)
    +{
    + struct gs_port *port = tty->driver_data;
    + struct gserial *gser;
    + int ret = -ENOIOCTLCMD;
    +
    + spin_lock_irq(&port->port_lock);
    + gser = port->port_usb;
    + if (gser && gser->ioctl)
    + ret = gser->ioctl(gser, cmd, arg);
    + spin_unlock_irq(&port->port_lock);
    + return ret;
    +}
    +
    static const struct tty_operations gs_tty_ops = {
    .open = gs_open,
    .close = gs_close,
    @@ -1051,6 +1065,7 @@ static const struct tty_operations gs_tty_ops = {
    .unthrottle = gs_unthrottle,
    .break_ctl = gs_break_ctl,
    .poll = gs_poll,
    + .ioctl = gs_ioctl,
    };

    /*-------------------------------------------------------------------------*/
    diff --git a/drivers/usb/gadget/function/u_serial.h b/drivers/usb/gadget/function/u_serial.h
    index ce00840..8d0901e 100644
    --- a/drivers/usb/gadget/function/u_serial.h
    +++ b/drivers/usb/gadget/function/u_serial.h
    @@ -53,6 +53,7 @@ struct gserial {
    int (*send_break)(struct gserial *p, int duration);
    unsigned int (*poll)(struct gserial *p, struct file *file,
    poll_table *wait);
    + int (*ioctl)(struct gserial *p, unsigned int cmd, unsigned long arg);
    };

    /* utilities to allocate/free request and buffer */
    --
    2.7.4
    \
     
     \ /
      Last update: 2017-06-12 20:57    [W:3.212 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site