lkml.org 
[lkml]   [2010]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv6 02/16] pps: declare variables where they are used in switch
    Date
    Move variable declarations where they are used in pps_cdev_ioctl.

    Acked-by: Rodolfo Giometti <giometti@linux.it>
    Signed-off-by: Alexander Gordeev <lasaine@lvk.cs.msu.su>
    ---
    drivers/pps/pps.c | 10 ++++++----
    1 files changed, 6 insertions(+), 4 deletions(-)

    diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
    index ca5183b..c76afb9 100644
    --- a/drivers/pps/pps.c
    +++ b/drivers/pps/pps.c
    @@ -61,8 +61,6 @@ static long pps_cdev_ioctl(struct file *file,
    {
    struct pps_device *pps = file->private_data;
    struct pps_kparams params;
    - struct pps_fdata fdata;
    - unsigned long ticks;
    void __user *uarg = (void __user *) arg;
    int __user *iuarg = (int __user *) arg;
    int err;
    @@ -136,7 +134,9 @@ static long pps_cdev_ioctl(struct file *file,

    break;

    - case PPS_FETCH:
    + case PPS_FETCH: {
    + struct pps_fdata fdata;
    +
    pr_debug("PPS_FETCH: source %d\n", pps->id);

    err = copy_from_user(&fdata, uarg, sizeof(struct pps_fdata));
    @@ -149,6 +149,8 @@ static long pps_cdev_ioctl(struct file *file,
    if (fdata.timeout.flags & PPS_TIME_INVALID)
    err = wait_event_interruptible(pps->queue, pps->go);
    else {
    + unsigned long ticks;
    +
    pr_debug("timeout %lld.%09d\n",
    (long long) fdata.timeout.sec,
    fdata.timeout.nsec);
    @@ -185,7 +187,7 @@ static long pps_cdev_ioctl(struct file *file,
    return -EFAULT;

    break;
    -
    + }
    default:
    return -ENOTTY;
    break;
    --
    1.7.2.3


    \
     
     \ /
      Last update: 2010-12-17 20:57    [W:0.026 / U:0.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site