6 files changed, 43 insertions, 46 deletions

diff --git a/net/irda/irlan/irlan_client.c b/net/irda/irlan/irlan_client.c
index 6be1ec26b30c..42f7d960d055 100644
--- a/net/irda/irlan/irlan_client.c
+++ b/net/irda/irlan/irlan_client.c
@@ -436,7 +436,6 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         __u16 tmp_cpu; /* Temporary value in host order */
         __u8 *bytes;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         IRDA_DEBUG(4, "%s(), parm=%s\n", __func__ , param);
 
@@ -521,8 +520,7 @@ static void irlan_check_response_param(struct irlan_cb *self, char *param,
         /* FILTER_ENTRY, have we got an ethernet address? */
         if (strcmp(param, "FILTER_ENTRY") == 0) {
                 bytes = value;
-                IRDA_DEBUG(4, "Ethernet address = %s\n",
-                           print_mac(mac, bytes));
+                IRDA_DEBUG(4, "Ethernet address = %pM\n", bytes);
                 for (i = 0; i < 6; i++)
                         self->dev->dev_addr[i] = bytes[i];
         }
diff --git a/net/irda/irlan/irlan_common.c b/net/irda/irlan/irlan_common.c
index 9a1cd87e7142..774d73a76852 100644
--- a/net/irda/irlan/irlan_common.c
+++ b/net/irda/irlan/irlan_common.c
@@ -207,7 +207,7 @@ static struct irlan_cb *irlan_open(__u32 saddr, __u32 daddr)
         if (!dev)
                 return NULL;
 
-        self = dev->priv;
+        self = netdev_priv(dev);
         self->dev = dev;
 
         /*
diff --git a/net/irda/irlap_frame.c b/net/irda/irlap_frame.c
index f17b65af9c9b..2562ebc1b22c 100644
--- a/net/irda/irlap_frame.c
+++ b/net/irda/irlap_frame.c
@@ -1325,6 +1325,7 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
         struct irlap_cb *self;
         int command;
         __u8 control;
+        int ret = -1;
 
         if (!net_eq(dev_net(dev), &init_net))
                 goto out;
@@ -1333,25 +1334,21 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
         self = (struct irlap_cb *) dev->atalk_ptr;
 
         /* If the net device is down, then IrLAP is gone! */
-        if (!self || self->magic != LAP_MAGIC) {
-                dev_kfree_skb(skb);
-                return -1;
-        }
+        if (!self || self->magic != LAP_MAGIC)
+                goto err;
 
         /* We are no longer an "old" protocol, so we need to handle
          * share and non linear skbs. This should never happen, so
          * we don't need to be clever about it. Jean II */
         if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
                 IRDA_ERROR("%s: can't clone shared skb!\n", __func__);
-                dev_kfree_skb(skb);
-                return -1;
+                goto err;
         }
 
         /* Check if frame is large enough for parsing */
         if (!pskb_may_pull(skb, 2)) {
                 IRDA_ERROR("%s: frame too short!\n", __func__);
-                dev_kfree_skb(skb);
-                return -1;
+                goto err;
         }
 
         command    = skb->data[0] & CMD_FRAME;
@@ -1442,7 +1439,9 @@ int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev,
                 break;
         }
 out:
+        ret = 0;
+err:
         /* Always drop our reference on the skb */
         dev_kfree_skb(skb);
-        return 0;
+        return ret;
 }
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 9ab3df15425d..57f8817c3979 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -118,8 +118,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_discovery,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &do_discovery,
-                .strategy       = &sysctl_intvec
+                .proc_handler   = do_discovery,
+                .strategy       = sysctl_intvec
         },
         {
                 .ctl_name       = NET_IRDA_DEVNAME,
@@ -127,8 +127,8 @@ static ctl_table irda_table[] = {
                 .data           = sysctl_devname,
                 .maxlen         = 65,
                 .mode           = 0644,
-                .proc_handler   = &do_devname,
-                .strategy       = &sysctl_string
+                .proc_handler   = do_devname,
+                .strategy       = sysctl_string
         },
 #ifdef CONFIG_IRDA_DEBUG
         {
@@ -137,7 +137,7 @@ static ctl_table irda_table[] = {
                 .data           = &irda_debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
 #endif
 #ifdef CONFIG_IRDA_FAST_RR
@@ -147,7 +147,7 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_fast_poll_increase,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
 #endif
         {
@@ -156,8 +156,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_discovery_slots,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_discovery_slots,
                 .extra2         = &max_discovery_slots
         },
@@ -167,7 +167,7 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_discovery_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
         {
                 .ctl_name       = NET_IRDA_SLOT_TIMEOUT,
@@ -175,8 +175,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_slot_timeout,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_slot_timeout,
                 .extra2         = &max_slot_timeout
         },
@@ -186,8 +186,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_max_baud_rate,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_max_baud_rate,
                 .extra2         = &max_max_baud_rate
         },
@@ -197,8 +197,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_min_tx_turn_time,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_min_tx_turn_time,
                 .extra2         = &max_min_tx_turn_time
         },
@@ -208,8 +208,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_max_tx_data_size,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_max_tx_data_size,
                 .extra2         = &max_max_tx_data_size
         },
@@ -219,8 +219,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_max_tx_window,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_max_tx_window,
                 .extra2         = &max_max_tx_window
         },
@@ -230,8 +230,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_max_noreply_time,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_max_noreply_time,
                 .extra2         = &max_max_noreply_time
         },
@@ -241,8 +241,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_warn_noreply_time,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_warn_noreply_time,
                 .extra2         = &max_warn_noreply_time
         },
@@ -252,8 +252,8 @@ static ctl_table irda_table[] = {
                 .data           = &sysctl_lap_keepalive_time,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec_minmax,
-                .strategy       = &sysctl_intvec,
+                .proc_handler   = proc_dointvec_minmax,
+                .strategy       = sysctl_intvec,
                 .extra1         = &min_lap_keepalive_time,
                 .extra2         = &max_lap_keepalive_time
         },
diff --git a/net/irda/irttp.c b/net/irda/irttp.c
index 74e439e80823..ecf4eb2717cb 100644
--- a/net/irda/irttp.c
+++ b/net/irda/irttp.c
@@ -201,7 +201,7 @@ static void irttp_todo_expired(unsigned long data)
  *
  *     Flushes (removes all frames) in transitt-buffer (tx_list)
  */
-void irttp_flush_queues(struct tsap_cb *self)
+static void irttp_flush_queues(struct tsap_cb *self)
 {
         struct sk_buff* skb;
 
@@ -1266,9 +1266,9 @@ static void irttp_connect_confirm(void *instance, void *sap,
  *    Some other device is connecting to this TSAP
  *
  */
-void irttp_connect_indication(void *instance, void *sap, struct qos_info *qos,
-                              __u32 max_seg_size, __u8 max_header_size,
-                              struct sk_buff *skb)
+static void irttp_connect_indication(void *instance, void *sap,
+                struct qos_info *qos, __u32 max_seg_size, __u8 max_header_size,
+                struct sk_buff *skb)
 {
         struct tsap_cb *self;
         struct lsap_cb *lsap;
@@ -1579,8 +1579,8 @@ EXPORT_SYMBOL(irttp_disconnect_request);
  *    Disconnect indication, TSAP disconnected by peer?
  *
  */
-void irttp_disconnect_indication(void *instance, void *sap, LM_REASON reason,
-                                 struct sk_buff *skb)
+static void irttp_disconnect_indication(void *instance, void *sap,
+                LM_REASON reason, struct sk_buff *skb)
 {
         struct tsap_cb *self;
 
@@ -1664,7 +1664,7 @@ static void irttp_do_data_indication(struct tsap_cb *self, struct sk_buff *skb)
  *     Check if we have any frames to be transmitted, or if we have any
  *     available credit to give away.
  */
-void irttp_run_rx_queue(struct tsap_cb *self)
+static void irttp_run_rx_queue(struct tsap_cb *self)
 {
         struct sk_buff *skb;
         int more = 0;
diff --git a/net/irda/timer.c b/net/irda/timer.c
index d730099080a2..0335ba0cc593 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -219,7 +219,7 @@ static void irlap_backoff_timer_expired(void *data)
  *
  *
  */
-void irlap_media_busy_expired(void* data)
+static void irlap_media_busy_expired(void *data)
 {
         struct irlap_cb *self = (struct irlap_cb *) data;