[dahdi-commits] tzafrir: linux/trunk r7768 - /linux/trunk/drivers/dahdi/dahdi-base.c
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Wed Jan 6 13:02:21 CST 2010
Author: tzafrir
Date: Wed Jan 6 13:02:17 2010
New Revision: 7768
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7768
Log:
Remove some unused 'struct inode *' function parameters.
Patch 0001 from issue #14808 (initial cleanup)
0001-dahdi-base-Remove-some-unused-struct-inode-function-.patch uploaded
by sruffell (license 456)
Modified:
linux/trunk/drivers/dahdi/dahdi-base.c
Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=7768&r1=7767&r2=7768
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Wed Jan 6 13:02:17 2010
@@ -304,7 +304,7 @@
.mfr2_tonelen = DEFAULT_MFR2_LENGTH,
};
-static int dahdi_chan_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data, int unit);
+static int dahdi_chan_ioctl(struct file *file, unsigned int cmd, unsigned long data, int unit);
#if defined(CONFIG_DAHDI_MMX) || defined(ECHO_CAN_FP)
#if (defined(CONFIG_X86) && !defined(CONFIG_X86_64)) || defined(CONFIG_I386)
@@ -2248,25 +2248,25 @@
return amnt;
}
-static int dahdi_ctl_open(struct inode *inode, struct file *file)
+static int dahdi_ctl_open(struct file *file)
{
/* Nothing to do, really */
return 0;
}
-static int dahdi_chan_open(struct inode *inode, struct file *file)
+static int dahdi_chan_open(struct file *file)
{
/* Nothing to do here for now either */
return 0;
}
-static int dahdi_ctl_release(struct inode *inode, struct file *file)
+static int dahdi_ctl_release(struct file *file)
{
/* Nothing to do */
return 0;
}
-static int dahdi_chan_release(struct inode *inode, struct file *file)
+static int dahdi_chan_release(struct file *file)
{
/* Nothing to do for now */
return 0;
@@ -2626,7 +2626,7 @@
return 0;
}
-static int dahdi_timing_open(struct inode *inode, struct file *file)
+static int dahdi_timing_open(struct file *file)
{
struct dahdi_timer *t;
unsigned long flags;
@@ -2645,7 +2645,7 @@
return 0;
}
-static int dahdi_timer_release(struct inode *inode, struct file *file)
+static int dahdi_timer_release(struct file *file)
{
struct dahdi_timer *t, *cur, *next;
unsigned long flags;
@@ -2674,7 +2674,7 @@
return 0;
}
-static int dahdi_specchan_open(struct inode *inode, struct file *file, int unit)
+static int dahdi_specchan_open(struct file *file, int unit)
{
int res = 0;
struct dahdi_chan *const chan = chans[unit];
@@ -2720,7 +2720,7 @@
return res;
}
-static int dahdi_specchan_release(struct inode *node, struct file *file, int unit)
+static int dahdi_specchan_release(struct file *file, int unit)
{
int res=0;
unsigned long flags;
@@ -2797,7 +2797,7 @@
struct dahdi_chan *chan;
/* Minor 0: Special "control" descriptor */
if (!unit)
- return dahdi_ctl_open(inode, file);
+ return dahdi_ctl_open(file);
if (unit == 250) {
if (!dahdi_transcode_fops) {
if (request_module("dahdi_transcode")) {
@@ -2822,32 +2822,32 @@
}
if (unit == 253) {
if (can_open_timer()) {
- return dahdi_timing_open(inode, file);
+ return dahdi_timing_open(file);
} else {
return -ENXIO;
}
}
if (unit == 254)
- return dahdi_chan_open(inode, file);
+ return dahdi_chan_open(file);
if (unit == 255) {
chan = dahdi_alloc_pseudo();
if (chan) {
file->private_data = chan;
- return dahdi_specchan_open(inode, file, chan->channo);
+ return dahdi_specchan_open(file, chan->channo);
} else {
return -ENXIO;
}
}
- return dahdi_specchan_open(inode, file, unit);
+ return dahdi_specchan_open(file, unit);
}
#if 0
-static int dahdi_open(struct inode *inode, struct file *file)
+static int dahdi_open(struct file *file)
{
int res;
unsigned long flags;
spin_lock_irqsave(&bigzaplock, flags);
- res = __dahdi_open(inode, file);
+ res = __dahdi_open(file);
spin_unlock_irqrestore(&bigzaplock, flags);
return res;
}
@@ -3369,9 +3369,9 @@
struct dahdi_chan *chan;
if (!unit)
- return dahdi_ctl_release(inode, file);
+ return dahdi_ctl_release(file);
if (unit == 253) {
- return dahdi_timer_release(inode, file);
+ return dahdi_timer_release(file);
}
if (unit == 250) {
/* We should not be here because the dahdi_transcode.ko module
@@ -3383,14 +3383,14 @@
if (unit == 254) {
chan = file->private_data;
if (!chan)
- return dahdi_chan_release(inode, file);
+ return dahdi_chan_release(file);
else
- return dahdi_specchan_release(inode, file, chan->channo);
+ return dahdi_specchan_release(file, chan->channo);
}
if (unit == 255) {
chan = file->private_data;
if (chan) {
- res = dahdi_specchan_release(inode, file, chan->channo);
+ res = dahdi_specchan_release(file, chan->channo);
dahdi_free_pseudo(chan);
} else {
module_printk(KERN_NOTICE, "Pseudo release and no private data??\n");
@@ -3398,7 +3398,7 @@
}
return res;
}
- return dahdi_specchan_release(inode, file, unit);
+ return dahdi_specchan_release(file, unit);
}
#if 0
@@ -3408,7 +3408,7 @@
unsigned long flags;
int res;
spin_lock_irqsave(&bigzaplock, flags);
- res = __dahdi_release(inode, file);
+ res = __dahdi_release(file);
spin_unlock_irqrestore(&bigzaplock, flags);
return res;
}
@@ -3494,7 +3494,7 @@
return -ENXIO; \
} while(0)
-static int dahdi_timer_ioctl(struct inode *node, struct file *file, unsigned int cmd, unsigned long data, struct dahdi_timer *timer)
+static int dahdi_timer_ioctl(struct file *file, unsigned int cmd, unsigned long data, struct dahdi_timer *timer)
{
int j;
unsigned long flags;
@@ -3543,7 +3543,7 @@
return 0;
}
-static int dahdi_ioctl_getgains(struct inode *node, struct file *file,
+static int dahdi_ioctl_getgains(struct file *file,
unsigned int cmd, unsigned long data, int unit)
{
int res = 0;
@@ -3588,7 +3588,7 @@
return res;
}
-static int dahdi_ioctl_setgains(struct inode *node, struct file *file,
+static int dahdi_ioctl_setgains(struct file *file,
unsigned int cmd, unsigned long data, int unit)
{
int res = 0;
@@ -3665,7 +3665,7 @@
return res;
}
-static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned int cmd, unsigned long data, int unit)
+static int dahdi_common_ioctl(struct file *file, unsigned int cmd, unsigned long data, int unit)
{
union {
struct dahdi_spaninfo spaninfo;
@@ -3798,9 +3798,9 @@
break;
case DAHDI_GETGAINS_V1: /* Intentional drop through. */
case DAHDI_GETGAINS: /* get gain stuff */
- return dahdi_ioctl_getgains(node, file, cmd, data, unit);
+ return dahdi_ioctl_getgains(file, cmd, data, unit);
case DAHDI_SETGAINS: /* set gain stuff */
- return dahdi_ioctl_setgains(node, file, cmd, data, unit);
+ return dahdi_ioctl_setgains(file, cmd, data, unit);
case DAHDI_SPANSTAT:
size_to_copy = sizeof(struct dahdi_spaninfo);
if (copy_from_user(&stack.spaninfo, (struct dahdi_spaninfo *) data, size_to_copy))
@@ -3965,7 +3965,7 @@
#endif
}
-static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
+static int dahdi_ctl_ioctl(struct file *file, unsigned int cmd, unsigned long data)
{
/* I/O CTL's for control interface */
int i,j;
@@ -3983,7 +3983,7 @@
if (copy_from_user(&ind, (struct dahdi_indirect_data *)data, sizeof(ind)))
return -EFAULT;
VALID_CHANNEL(ind.chan);
- return dahdi_chan_ioctl(inode, file, ind.op, (unsigned long) ind.data, ind.chan);
+ return dahdi_chan_ioctl(file, ind.op, (unsigned long) ind.data, ind.chan);
}
case DAHDI_SPANCONFIG:
{
@@ -4459,7 +4459,7 @@
}
return -ENOSYS;
default:
- return dahdi_common_ioctl(inode, file, cmd, data, 0);
+ return dahdi_common_ioctl(file, cmd, data, 0);
}
return 0;
}
@@ -4521,7 +4521,7 @@
return rv;
}
-static int dahdi_chanandpseudo_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data, int unit)
+static int dahdi_chanandpseudo_ioctl(struct file *file, unsigned int cmd, unsigned long data, int unit)
{
struct dahdi_chan *chan = chans[unit];
union {
@@ -5007,7 +5007,7 @@
break;
default:
/* Check for common ioctl's and private ones */
- rv = dahdi_common_ioctl(inode, file, cmd, data, unit);
+ rv = dahdi_common_ioctl(file, cmd, data, unit);
/* if no span, just return with value */
if (!chan->span) return rv;
if ((rv == -ENOTTY) && chan->span->ioctl)
@@ -5213,7 +5213,7 @@
}
}
-static int dahdi_chan_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data, int unit)
+static int dahdi_chan_ioctl(struct file *file, unsigned int cmd, unsigned long data, int unit)
{
struct dahdi_chan *chan = chans[unit];
unsigned long flags;
@@ -5592,12 +5592,12 @@
break;
#endif
default:
- return dahdi_chanandpseudo_ioctl(inode, file, cmd, data, unit);
+ return dahdi_chanandpseudo_ioctl(file, cmd, data, unit);
}
return 0;
}
-static int dahdi_prechan_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data, int unit)
+static int dahdi_prechan_ioctl(struct file *file, unsigned int cmd, unsigned long data, int unit)
{
struct dahdi_chan *chan = file->private_data;
int channo;
@@ -5613,7 +5613,7 @@
return -EINVAL;
if (channo > DAHDI_MAX_CHANNELS)
return -EINVAL;
- res = dahdi_specchan_open(inode, file, channo);
+ res = dahdi_specchan_open(file, channo);
if (!res) {
/* Setup the pointer for future stuff */
chan = chans[channo];
@@ -5628,14 +5628,14 @@
return 0;
}
-static int dahdi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long data)
+static int dahdi_ioctl(struct file *file, unsigned int cmd, unsigned long data)
{
int unit = UNIT(file);
struct dahdi_chan *chan;
struct dahdi_timer *timer;
if (!unit)
- return dahdi_ctl_ioctl(inode, file, cmd, data);
+ return dahdi_ctl_ioctl(file, cmd, data);
if (unit == 250) {
/* dahdi_transcode should have updated the file_operations on
@@ -5647,16 +5647,16 @@
if (unit == 253) {
timer = file->private_data;
if (timer)
- return dahdi_timer_ioctl(inode, file, cmd, data, timer);
+ return dahdi_timer_ioctl(file, cmd, data, timer);
else
return -EINVAL;
}
if (unit == 254) {
chan = file->private_data;
if (chan)
- return dahdi_chan_ioctl(inode, file, cmd, data, chan->channo);
+ return dahdi_chan_ioctl(file, cmd, data, chan->channo);
else
- return dahdi_prechan_ioctl(inode, file, cmd, data, unit);
+ return dahdi_prechan_ioctl(file, cmd, data, unit);
}
if (unit == 255) {
chan = file->private_data;
@@ -5664,9 +5664,9 @@
module_printk(KERN_NOTICE, "No pseudo channel structure to read?\n");
return -EINVAL;
}
- return dahdi_chanandpseudo_ioctl(inode, file, cmd, data, chan->channo);
- }
- return dahdi_chan_ioctl(inode, file, cmd, data, unit);
+ return dahdi_chanandpseudo_ioctl(file, cmd, data, chan->channo);
+ }
+ return dahdi_chan_ioctl(file, cmd, data, unit);
}
More information about the dahdi-commits
mailing list