Title: [9263] trunk/drivers/char/bfin_twi_lcd.c: bfin_twi_lcd: update ioctl code to 2.6.36 changes
- Revision
- 9263
- Author
- vapier
- Date
- 2010-10-21 00:33:34 -0400 (Thu, 21 Oct 2010)
Log Message
bfin_twi_lcd: update ioctl code to 2.6.36 changes
Modified Paths
Diff
Modified: trunk/drivers/char/bfin_twi_lcd.c (9262 => 9263)
--- trunk/drivers/char/bfin_twi_lcd.c 2010-10-21 04:33:18 UTC (rev 9262)
+++ trunk/drivers/char/bfin_twi_lcd.c 2010-10-21 04:33:34 UTC (rev 9263)
@@ -192,10 +192,8 @@
.id_table = pcf8574_lcd_id,
};
-static int lcd_ioctl(struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg)
+static long lcd_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
-
switch (cmd) {
case LCD_Contr:
@@ -339,8 +337,8 @@
static const struct file_operations lcd_fops = {
.owner = THIS_MODULE,
.write = lcd_write,
- .ioctl = lcd_ioctl,
- .open = lcd_open,
+ .unlocked_ioctl = lcd_ioctl,
+ .open = lcd_open,
};
static struct miscdevice bfin_twi_lcd_dev = {
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
