Mercurial > pt1

comparison driver/pt1_pci.c @ 118:53266592882d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
follow changes in struct file_operations. .ioctl has been removed in 2.6.36.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Thu, 18 Nov 2010 23:01:40 +0900
parents c8cfd684fee8
children 7662d0ecd74b
comparison
equal deleted inserted replaced
117:4d42c5c28557 118:53266592882d
509 509
510 printk(KERN_INFO "used bs tuners on %p = %d\n", device, count); 510 printk(KERN_INFO "used bs tuners on %p = %d\n", device, count);
511 return count; 511 return count;
512 } 512 }
513 513
514 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
515 static long pt1_ioctl(struct file *file, unsigned int cmd, unsigned long arg0)
516 #else
514 static int pt1_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg0) 517 static int pt1_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg0)
518 #endif
515 { 519 {
516 PT1_CHANNEL *channel = file->private_data; 520 PT1_CHANNEL *channel = file->private_data;
517 int signal; 521 int signal;
518 unsigned long dummy; 522 unsigned long dummy;
519 void *arg = (void *)arg0; 523 void *arg = (void *)arg0;
573 static const struct file_operations pt1_fops = { 577 static const struct file_operations pt1_fops = {
574 .owner = THIS_MODULE, 578 .owner = THIS_MODULE,
575 .open = pt1_open, 579 .open = pt1_open,
576 .release = pt1_release, 580 .release = pt1_release,
577 .read = pt1_read, 581 .read = pt1_read,
582 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)
583 .unlocked_ioctl = pt1_ioctl,
584 #else
578 .ioctl = pt1_ioctl, 585 .ioctl = pt1_ioctl,
586 #endif
579 .llseek = no_llseek, 587 .llseek = no_llseek,
580 }; 588 };
581 589
582 int pt1_makering(struct pci_dev *pdev, PT1_DEVICE *dev_conf) 590 int pt1_makering(struct pci_dev *pdev, PT1_DEVICE *dev_conf)
583 { 591 {