From b5d4ebfe98de3f736f69afcf92b078964477b8aa Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 4 Nov 2009 01:15:24 -0600 Subject: [PATCH 1/2] dahdi-base: Remove some unused 'struct inode *' function parameters. --- drivers/dahdi/dahdi-base.c | 94 ++++++++++++++++++++++---------------------- 1 files changed, 47 insertions(+), 47 deletions(-) diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 2c6fc0d..5def807 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -304,7 +304,7 @@ static struct dahdi_dialparams global_dialparams = { .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) @@ -2238,25 +2238,25 @@ static ssize_t dahdi_chan_write(struct file *file, const char __user *usrbuf, si 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; @@ -2616,7 +2616,7 @@ static int initialize_channel(struct dahdi_chan *chan) 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; @@ -2635,7 +2635,7 @@ static int dahdi_timing_open(struct inode *inode, struct file *file) 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; @@ -2664,7 +2664,7 @@ static int dahdi_timer_release(struct inode *inode, struct file *file) 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]; @@ -2710,7 +2710,7 @@ static int dahdi_specchan_open(struct inode *inode, struct file *file, int unit) 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; @@ -2787,7 +2787,7 @@ static int dahdi_open(struct inode *inode, struct file *file) 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")) { @@ -2812,32 +2812,32 @@ static int dahdi_open(struct inode *inode, struct file *file) } 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; } @@ -3352,16 +3352,16 @@ static void __do_dtmf(struct dahdi_chan *chan) __qevent(chan, DAHDI_EVENT_DIALCOMPLETE); } -static int dahdi_release(struct inode *inode, struct file *file) +static int dahdi_release(struct file *file) { int unit = UNIT(file); int res; 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 @@ -3373,14 +3373,14 @@ static int dahdi_release(struct inode *inode, struct file *file) 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"); @@ -3388,17 +3388,17 @@ static int dahdi_release(struct inode *inode, struct file *file) } return res; } - return dahdi_specchan_release(inode, file, unit); + return dahdi_specchan_release(file, unit); } #if 0 -static int dahdi_release(struct inode *inode, struct file *file) +static int dahdi_release(struct file *file) { /* Lock the big zap lock when handling a release */ 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; } @@ -3484,7 +3484,7 @@ void dahdi_alarm_notify(struct dahdi_span *span) 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; @@ -3533,7 +3533,7 @@ static int dahdi_timer_ioctl(struct inode *node, struct file *file, unsigned int 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; @@ -3578,7 +3578,7 @@ cleanup: 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; @@ -3655,7 +3655,7 @@ cleanup: 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; @@ -3788,9 +3788,9 @@ static int dahdi_common_ioctl(struct inode *node, struct file *file, unsigned in 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)) @@ -3955,7 +3955,7 @@ static void recalc_slaves(struct dahdi_chan *chan) #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; @@ -3973,7 +3973,7 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int 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: { @@ -4449,7 +4449,7 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int } return -ENOSYS; default: - return dahdi_common_ioctl(inode, file, cmd, data, 0); + return dahdi_common_ioctl(file, cmd, data, 0); } return 0; } @@ -4511,7 +4511,7 @@ static int ioctl_dahdi_dial(struct dahdi_chan *chan, unsigned long data) 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 { @@ -4997,7 +4997,7 @@ static int dahdi_chanandpseudo_ioctl(struct inode *inode, struct file *file, uns 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) @@ -5203,7 +5203,7 @@ static void set_echocan_fax_mode(struct dahdi_chan *chan, unsigned int channo, c } } -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; @@ -5578,12 +5578,12 @@ static int dahdi_chan_ioctl(struct inode *inode, struct file *file, unsigned int 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; @@ -5599,7 +5599,7 @@ static int dahdi_prechan_ioctl(struct inode *inode, struct file *file, unsigned 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]; @@ -5614,14 +5614,14 @@ static int dahdi_prechan_ioctl(struct inode *inode, struct file *file, unsigned 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 @@ -5633,16 +5633,16 @@ static int dahdi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 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; @@ -5650,9 +5650,9 @@ static int dahdi_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 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_chanandpseudo_ioctl(file, cmd, data, chan->channo); } - return dahdi_chan_ioctl(inode, file, cmd, data, unit); + return dahdi_chan_ioctl(file, cmd, data, unit); } -- 1.6.5.2