From fab64571294935f8ba8d7196a55f6b5d941f21f6 Mon Sep 17 00:00:00 2001 From: linjh Date: Thu, 1 Dec 2011 17:31:32 +0800 Subject: [PATCH] phonesdk: fixup function interface of gns7560 driver ioctl in kernel-3.0 --- drivers/misc/gps/rk29_gps.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/gps/rk29_gps.c b/drivers/misc/gps/rk29_gps.c index a9414f3fdd54..4931123a8b24 100755 --- a/drivers/misc/gps/rk29_gps.c +++ b/drivers/misc/gps/rk29_gps.c @@ -156,7 +156,7 @@ static void rk29_gps_delay_power_downup(struct work_struct *work) return; } - DBG("%s: suspend=%d\n", __func__, pdata->suspend); + //DBG("%s: suspend=%d\n", __func__, pdata->suspend); down(&pdata->power_sem); @@ -192,16 +192,16 @@ ssize_t rk29_gps_read(struct file *filp, char __user *ptr, size_t size, loff_t * return sizeof(int); } -int rk29_gps_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg) +long rk29_gps_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - int ret = 0; + long ret = 0; struct rk29_gps_data *pdata = pgps; - DBG("rk29_gps_ioctl: cmd = %d\n",cmd); + DBG("rk29_gps_ioctl: cmd = %d arg = %ld\n",cmd, arg); ret = down_interruptible(&pdata->power_sem); if (ret < 0) { - printk("%s: down power_sem error ret = %d\n", __func__, ret); + printk("%s: down power_sem error ret = %ld\n", __func__, ret); return ret; } -- 2.34.1