diff options
| author | Stephen Hemminger <shemminger@osdl.org> | 2003-08-15 18:09:42 -0700 |
|---|---|---|
| committer | Stephen Hemminger <shemminger@osdl.org> | 2003-08-15 18:09:42 -0700 |
| commit | bd07d52e74b32fcba9538307369de1f3a86996ce (patch) | |
| tree | e517c35d58bf039107ef6330d7fb7cf9c16daebc | |
| parent | ee105769c36b78ca603ac3b0548b818b90a2482c (diff) | |
[IRDA]: irda_device_setup should match ether_setup.
irda_device_setup signature should match ether_setup so it can
be used with alloc_netdev. No caller was checking the return
value anyway.
| -rw-r--r-- | include/net/irda/irda_device.h | 2 | ||||
| -rw-r--r-- | net/irda/irda_device.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 72fca5622438..a871de37d949 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h @@ -222,7 +222,7 @@ int irda_device_txqueue_empty(struct net_device *dev); int irda_device_set_raw_mode(struct net_device* self, int status); int irda_device_set_dtr_rts(struct net_device *dev, int dtr, int rts); int irda_device_change_speed(struct net_device *dev, __u32 speed); -int irda_device_setup(struct net_device *dev); +void irda_device_setup(struct net_device *dev); /* Dongle interface */ void irda_device_unregister_dongle(struct dongle_reg *dongle); diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 5092abb62d54..5f3f6feaad66 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c @@ -383,10 +383,8 @@ static void irda_device_destructor(struct net_device *dev) * This function should be used by low level device drivers in a similar way * as ether_setup() is used by normal network device drivers */ -int irda_device_setup(struct net_device *dev) +void irda_device_setup(struct net_device *dev) { - ASSERT(dev != NULL, return -1;); - dev->hard_header_len = 0; dev->addr_len = 0; @@ -399,7 +397,6 @@ int irda_device_setup(struct net_device *dev) dev->mtu = 2048; dev->flags = IFF_NOARP; - return 0; } /* |