aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-04-14 16:00:59 -0700
committerDavid S. Miller <davem@davemloft.net>2006-04-14 16:00:59 -0700
commit5ff765f3d0b9367319d29ab0c0f55349da2fd53e (patch)
treef7add0ab41bd6d2a983ff39191edca799fe6561b
parentdcdb02752ff13a64433c36f2937a58d93ae7a19e (diff)
[ATM] clip: notifier related cleanups
Cleanup some code around notifier. Don't need (void) casts to ignore return values, and use C90 style initializer. Just ignore unused device events. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/atm/clip.c26
1 files changed, 6 insertions, 20 deletions
diff --git a/net/atm/clip.c b/net/atm/clip.c
index 49258eed936..7ebb81a8bc0 100644
--- a/net/atm/clip.c
+++ b/net/atm/clip.c
@@ -443,7 +443,7 @@ static int clip_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
clip_priv->stats.tx_packets++;
clip_priv->stats.tx_bytes += skb->len;
- (void)vcc->send(vcc, skb);
+ vcc->send(vcc, skb);
if (atm_may_send(vcc, 0)) {
entry->vccs->xoff = 0;
return 0;
@@ -620,26 +620,16 @@ static int clip_device_event(struct notifier_block *this, unsigned long event,
switch (event) {
case NETDEV_UP:
DPRINTK("clip_device_event NETDEV_UP\n");
- (void)to_atmarpd(act_up, PRIV(dev)->number, 0);
+ to_atmarpd(act_up, PRIV(dev)->number, 0);
break;
case NETDEV_GOING_DOWN:
DPRINTK("clip_device_event NETDEV_DOWN\n");
- (void)to_atmarpd(act_down, PRIV(dev)->number, 0);
+ to_atmarpd(act_down, PRIV(dev)->number, 0);
break;
case NETDEV_CHANGE:
case NETDEV_CHANGEMTU:
DPRINTK("clip_device_event NETDEV_CHANGE*\n");
- (void)to_atmarpd(act_change, PRIV(dev)->number, 0);
- break;
- case NETDEV_REBOOT:
- case NETDEV_REGISTER:
- case NETDEV_DOWN:
- DPRINTK("clip_device_event %ld\n", event);
- /* ignore */
- break;
- default:
- printk(KERN_WARNING "clip_device_event: unknown event "
- "%ld\n", event);
+ to_atmarpd(act_change, PRIV(dev)->number, 0);
break;
}
return NOTIFY_DONE;
@@ -666,17 +656,13 @@ static int clip_inet_event(struct notifier_block *this, unsigned long event,
static struct notifier_block clip_dev_notifier = {
- clip_device_event,
- NULL,
- 0
+ .notifier_call = clip_device_event,
};
static struct notifier_block clip_inet_notifier = {
- clip_inet_event,
- NULL,
- 0
+ .notifier_call = clip_inet_event,
};