summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2005-10-31 00:03:40 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-31 02:37:30 +0100
commitc860ed9fb5d320407f99190ab2e31bfe74db6724 (patch)
tree69c650e001738130ac69152a195ae824b5ef2ee4 /drivers/char
parent[PATCH] hpet: fix access to multiple HPET devices (diff)
downloadlinux-c860ed9fb5d320407f99190ab2e31bfe74db6724.tar.xz
linux-c860ed9fb5d320407f99190ab2e31bfe74db6724.zip
[PATCH] hpet: remove superfluous indirections
In the hpet_ioctl_common() function, devp->hd_hpets is already cached in the hpetp variable, so we can use just that. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Cc: Bob Picco <bob.picco@hp.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/hpet.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index cdf2ec842e2c..cf325622b396 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -501,8 +501,8 @@ hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
info.hi_ireqfreq = 0;
info.hi_flags =
readq(&timer->hpet_config) & Tn_PER_INT_CAP_MASK;
- info.hi_hpet = devp->hd_hpets->hp_which;
- info.hi_timer = devp - devp->hd_hpets->hp_dev;
+ info.hi_hpet = hpetp->hp_which;
+ info.hi_timer = devp - hpetp->hp_dev;
if (kernel)
memcpy((void *)arg, &info, sizeof(info));
else