Title: [9260] trunk/drivers/char/bfin_spi_adc.c: bfin_spi_adc: update ioctl code to 2.6.36 changes
- Revision
- 9260
- Author
- vapier
- Date
- 2010-10-21 00:32:31 -0400 (Thu, 21 Oct 2010)
Log Message
bfin_spi_adc: update ioctl code to 2.6.36 changes
Modified Paths
Diff
Modified: trunk/drivers/char/bfin_spi_adc.c (9259 => 9260)
--- trunk/drivers/char/bfin_spi_adc.c 2010-10-21 03:02:15 UTC (rev 9259)
+++ trunk/drivers/char/bfin_spi_adc.c 2010-10-21 04:32:31 UTC (rev 9260)
@@ -62,9 +62,9 @@
static struct spi_adc spi_adc;
static DEFINE_SPINLOCK(spiadc_lock);
-static int adc_spi_ioctl(struct inode *inode, struct file *filp, uint cmd, unsigned long arg)
+static long adc_spi_ioctl(struct file *filp, uint cmd, unsigned long arg)
{
- int ret = 0;
+ long ret = 0;
unsigned long value;
struct spi_adc *spi_adc = filp->private_data;
@@ -214,7 +214,7 @@
.owner = THIS_MODULE,
.read = adc_spi_read,
.write = adc_spi_write,
- .ioctl = adc_spi_ioctl,
+ .unlocked_ioctl = adc_spi_ioctl,
.open = adc_spi_open,
.release = adc_spi_release,
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
