Prev: block_dev: always serialize exclusive open attempts
Next: usb gadget: don't save bind callback in struct usb_configuration
From: Rodolfo Giometti on 5 Aug 2010 05:10
On Thu, Aug 05, 2010 at 01:06:39AM +0400, Alexander Gordeev wrote:
> Move variable declarations where they are used in pps_cdev_ioctl.
>
> Signed-off-by: Alexander Gordeev <lasaine(a)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.1

I don't like such definitions but I know it is just a stylistic
problem, so it's ok for me. :)

Acked-by: Rodolfo Giometti <giometti(a)linux.it>

--

GNU/Linux Solutions e-mail: giometti(a)enneenne.com
Linux Device Driver giometti(a)linux.it
Embedded Systems phone: +39 349 2432127
UNIX programming skype: rodolfo.giometti
Freelance ICT Italia - Consulente ICT Italia - www.consulenti-ict.it
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: block_dev: always serialize exclusive open attempts
Next: usb gadget: don't save bind callback in struct usb_configuration