lkml.org 
[lkml]   [2009]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subjecthpet: Convert to unlocked_ioctl

This patch converts the hpet_ioctl to the unlocked version. It is meant to
be applied after the patch that removed the BKL from the hpet_open
function.

Note that .llseek is already explicitly set to no_llseek.

From 84e9964c4c7eeb4e99bb51e3a10768c1f869f259 Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Wed, 21 Oct 2009 13:34:42 +0200
Subject: [PATCH] hpet: Convert to unlocked_ioctl

The ioctl functions here rely on their own locking using the hpet_lock spinlock.

Signed-off-by: John Kacur <jkacur@redhat.com>
---
drivers/char/hpet.c | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index 5e83828..e7754cd 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -426,11 +426,9 @@ static int hpet_release(struct inode *inode, struct file *file)
return 0;
}

-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
+static long hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);

-static int
-hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
- unsigned long arg)
+static long hpet_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
struct hpet_dev *devp;

@@ -438,7 +436,7 @@ hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
return hpet_ioctl_common(devp, cmd, arg, 0);
}

-static int hpet_ioctl_ieon(struct hpet_dev *devp)
+static long hpet_ioctl_ieon(struct hpet_dev *devp)
{
struct hpet_timer __iomem *timer;
struct hpet __iomem *hpet;
@@ -545,13 +543,13 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
return (unsigned long)m;
}

-static int
+static long
hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
{
struct hpet_timer __iomem *timer;
struct hpet __iomem *hpet;
struct hpets *hpetp;
- int err;
+ long err = 0;
unsigned long v;

switch (cmd) {
@@ -570,8 +568,6 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
return -EINVAL;
}

- err = 0;
-
switch (cmd) {
case HPET_IE_OFF:
if ((devp->hd_flags & HPET_IE) == 0)
@@ -651,7 +647,7 @@ static const struct file_operations hpet_fops = {
.llseek = no_llseek,
.read = hpet_read,
.poll = hpet_poll,
- .ioctl = hpet_ioctl,
+ .unlocked_ioctl = hpet_ioctl,
.open = hpet_open,
.release = hpet_release,
.fasync = hpet_fasync,
--
1.6.0.6



\
 
 \ /
  Last update: 2009-10-21 13:49    [W:2.009 / U:0.028 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site