decnet: fix sparse warnings: context imbalance

[safe/jmp/linux-2.6] / net / decnet / dn_dev.c

diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
index 2f0ac3c..b6c80f3 100644 (file)
--- a/net/decnet/dn_dev.c
+++ b/net/decnet/dn_dev.c
@@ -152,7 +152,7 @@ static struct dn_dev_parms dn_dev_list[] =  {
 
 #define DN_DEV_LIST_SIZE ARRAY_SIZE(dn_dev_list)
 
-#define DN_DEV_PARMS_OFFSET(x) ((int) ((char *) &((struct dn_dev_parms *)0)->x))
+#define DN_DEV_PARMS_OFFSET(x) offsetof(struct dn_dev_parms, x)
 
 #ifdef CONFIG_SYSCTL
 
@@ -166,7 +166,7 @@ static int max_priority[] = { 127 }; /* From DECnet spec */
 
 static int dn_forwarding_proc(ctl_table *, int, struct file *,
                        void __user *, size_t *, loff_t *);
-static int dn_forwarding_sysctl(ctl_table *table, int __user *name, int nlen,
+static int dn_forwarding_sysctl(ctl_table *table,
                        void __user *oldval, size_t __user *oldlenp,
                        void __user *newval, size_t newlen);
 
@@ -318,7 +318,7 @@ static int dn_forwarding_proc(ctl_table *table, int write,
 #endif
 }
 
-static int dn_forwarding_sysctl(ctl_table *table, int __user *name, int nlen,
+static int dn_forwarding_sysctl(ctl_table *table,
                        void __user *oldval, size_t __user *oldlenp,
                        void __user *newval, size_t newlen)
 {
@@ -490,9 +490,7 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg)
                return -EFAULT;
        ifr->ifr_name[IFNAMSIZ-1] = 0;
 
-#ifdef CONFIG_KMOD
        dev_load(&init_net, ifr->ifr_name);
-#endif
 
        switch(cmd) {
                case SIOCGIFADDR:
@@ -771,7 +769,8 @@ static void dn_ifaddr_notify(int event, struct dn_ifaddr *ifa)
                kfree_skb(skb);
                goto errout;
        }
-       err = rtnl_notify(skb, &init_net, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL);
+       rtnl_notify(skb, &init_net, 0, RTNLGRP_DECnet_IFADDR, NULL, GFP_KERNEL);
+       return;
 errout:
        if (err < 0)
                rtnl_set_sk_err(&init_net, RTNLGRP_DECnet_IFADDR, err);
@@ -887,7 +886,7 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
        memcpy(msg->tiver, dn_eco_version, 3);
        dn_dn2eth(msg->id, ifa->ifa_local);
        msg->iinfo   = DN_RT_INFO_ENDN;
-       msg->blksize = dn_htons(mtu2blksize(dev));
+       msg->blksize = cpu_to_le16(mtu2blksize(dev));
        msg->area    = 0x00;
        memset(msg->seed, 0, 8);
        memcpy(msg->neighbor, dn_hiord, ETH_ALEN);
@@ -897,13 +896,13 @@ static void dn_send_endnode_hello(struct net_device *dev, struct dn_ifaddr *ifa)
                dn_dn2eth(msg->neighbor, dn->addr);
        }
 
-       msg->timer   = dn_htons((unsigned short)dn_db->parms.t3);
+       msg->timer   = cpu_to_le16((unsigned short)dn_db->parms.t3);
        msg->mpd     = 0x00;
        msg->datalen = 0x02;
        memset(msg->data, 0xAA, 2);
 
        pktlen = (__le16 *)skb_push(skb,2);
-       *pktlen = dn_htons(skb->len - 2);
+       *pktlen = cpu_to_le16(skb->len - 2);
 
        skb_reset_network_header(skb);
 
@@ -931,7 +930,7 @@ static int dn_am_i_a_router(struct dn_neigh *dn, struct dn_dev *dn_db, struct dn
        if (dn->priority != dn_db->parms.priority)
                return 0;
 
-       if (dn_ntohs(dn->addr) < dn_ntohs(ifa->ifa_local))
+       if (le16_to_cpu(dn->addr) < le16_to_cpu(ifa->ifa_local))
                return 1;
 
        return 0;
@@ -975,11 +974,11 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
        ptr += ETH_ALEN;
        *ptr++ = dn_db->parms.forwarding == 1 ?
                        DN_RT_INFO_L1RT : DN_RT_INFO_L2RT;
-       *((__le16 *)ptr) = dn_htons(mtu2blksize(dev));
+       *((__le16 *)ptr) = cpu_to_le16(mtu2blksize(dev));
        ptr += 2;
        *ptr++ = dn_db->parms.priority; /* Priority */
        *ptr++ = 0; /* Area: Reserved */
-       *((__le16 *)ptr) = dn_htons((unsigned short)dn_db->parms.t3);
+       *((__le16 *)ptr) = cpu_to_le16((unsigned short)dn_db->parms.t3);
        ptr += 2;
        *ptr++ = 0; /* MPD: Reserved */
        i1 = ptr++;
@@ -995,7 +994,7 @@ static void dn_send_router_hello(struct net_device *dev, struct dn_ifaddr *ifa)
        skb_trim(skb, (27 + *i2));
 
        pktlen = (__le16 *)skb_push(skb, 2);
-       *pktlen = dn_htons(skb->len - 2);
+       *pktlen = cpu_to_le16(skb->len - 2);
 
        skb_reset_network_header(skb);
 
@@ -1108,7 +1107,7 @@ static void dn_dev_set_timer(struct net_device *dev)
        add_timer(&dn_db->timer);
 }
 
-struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
+static struct dn_dev *dn_dev_create(struct net_device *dev, int *err)
 {
        int i;
        struct dn_dev_parms *p = dn_dev_list;
@@ -1324,6 +1323,7 @@ static inline int is_dn_dev(struct net_device *dev)
 }
 
 static void *dn_dev_seq_start(struct seq_file *seq, loff_t *pos)
+       __acquires(&dev_base_lock)
 {
        int i;
        struct net_device *dev;
@@ -1366,6 +1366,7 @@ static void *dn_dev_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void dn_dev_seq_stop(struct seq_file *seq, void *v)
+       __releases(&dev_base_lock)
 {
        read_unlock(&dev_base_lock);
 }
@@ -1403,8 +1404,8 @@ static int dn_dev_seq_show(struct seq_file *seq, void *v)
                                mtu2blksize(dev),
                                dn_db->parms.priority,
                                dn_db->parms.state, dn_db->parms.name,
-                               dn_db->router ? dn_addr2asc(dn_ntohs(*(__le16 *)dn_db->router->primary_key), router_buf) : "",
-                               dn_db->peer ? dn_addr2asc(dn_ntohs(*(__le16 *)dn_db->peer->primary_key), peer_buf) : "");
+                               dn_db->router ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db->router->primary_key), router_buf) : "",
+                               dn_db->peer ? dn_addr2asc(le16_to_cpu(*(__le16 *)dn_db->peer->primary_key), peer_buf) : "");
        }
        return 0;
 }
@@ -1447,7 +1448,7 @@ void __init dn_dev_init(void)
                return;
        }
 
-       decnet_address = dn_htons((addr[0] << 10) | addr[1]);
+       decnet_address = cpu_to_le16((addr[0] << 10) | addr[1]);
 
        dn_dev_devices_on();