[svn-commits] sruffell: linux/trunk r9142 - /linux/trunk/drivers/dahdi/dahdi_transcode.c

[SVN commits to the Digium repositories]

Author: sruffell
Date: Mon Aug 16 13:43:39 2010
New Revision: 9142

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9142
Log:
dahdi_transcode: No need for ioctl when unlocked_ioctl is available

More work to kill the BKL (Big Kernel Lock)
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=10041d2d14688e207d0d829095147aa82c1f211b

Modified:
    linux/trunk/drivers/dahdi/dahdi_transcode.c

Modified: linux/trunk/drivers/dahdi/dahdi_transcode.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi_transcode.c?view=diff&rev=9142&r1=9141&r2=9142
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_transcode.c (original)
+++ linux/trunk/drivers/dahdi/dahdi_transcode.c Mon Aug 16 13:43:39 2010
@@ -396,10 +396,12 @@
 	};
 }
 
+#ifndef HAVE_UNLOCKED_IOCTL
 static int dahdi_tc_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
 {
 	return (int)dahdi_tc_unlocked_ioctl(file, cmd, data);
 }
+#endif
 
 static int dahdi_tc_mmap(struct file *file, struct vm_area_struct *vma)
 {
@@ -430,14 +432,15 @@
 	.owner =   THIS_MODULE,
 	.open =    dahdi_tc_open,
 	.release = dahdi_tc_release,
-	.ioctl =   dahdi_tc_ioctl,
+#ifdef HAVE_UNLOCKED_IOCTL
+	.unlocked_ioctl  = dahdi_tc_unlocked_ioctl,
+#else
+	.ioctl   = dahdi_tc_ioctl,
+#endif
 	.read =    dahdi_tc_read,
 	.write =   dahdi_tc_write,
 	.poll =    dahdi_tc_poll,
 	.mmap =    dahdi_tc_mmap,
-#if HAVE_UNLOCKED_IOCTL
-	.unlocked_ioctl = dahdi_tc_unlocked_ioctl,
-#endif
 };
 
 static struct dahdi_chardev transcode_chardev = {