diff options
author | Patrick McHardy <kaber@trash.net> | 2009-07-05 22:23:38 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-07-05 22:23:38 -0400 |
commit | ec634fe328182a1a098585bfc7b69e5042bdb08d (patch) | |
tree | 02883aaee743af10d78d6d8fe9181944b4dd4529 /drivers/net/irda | |
parent | a73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f (diff) |
net: convert remaining non-symbolic return values in ndo_start_xmit() functions
This patch converts the remaining occurences of raw return values to their
symbolic counterparts in ndo_start_xmit() functions that were missed by the
previous automatic conversion.
Additionally code that assumed the symbolic value of NETDEV_TX_OK to be zero
is changed to explicitly use NETDEV_TX_OK.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/irda')
-rw-r--r-- | drivers/net/irda/ali-ircc.c | 4 | ||||
-rw-r--r-- | drivers/net/irda/donauboe.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/nsc-ircc.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/sir_dev.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/smsc-ircc2.c | 16 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.c | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 709835782443..f0d0cea6e329 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
@@ -1966,10 +1966,10 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1966 | 1966 | ||
1967 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ ); | 1967 | IRDA_DEBUG(2, "%s(), ---------------- Start ----------------\n", __func__ ); |
1968 | 1968 | ||
1969 | IRDA_ASSERT(dev != NULL, return 0;); | 1969 | IRDA_ASSERT(dev != NULL, return NETDEV_TX_OK;); |
1970 | 1970 | ||
1971 | self = netdev_priv(dev); | 1971 | self = netdev_priv(dev); |
1972 | IRDA_ASSERT(self != NULL, return 0;); | 1972 | IRDA_ASSERT(self != NULL, return NETDEV_TX_OK;); |
1973 | 1973 | ||
1974 | iobase = self->io.sir_base; | 1974 | iobase = self->io.sir_base; |
1975 | 1975 | ||
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c index 1484c76becfb..e4e905698dc7 100644 --- a/drivers/net/irda/donauboe.c +++ b/drivers/net/irda/donauboe.c | |||
@@ -981,7 +981,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev) | |||
981 | 981 | ||
982 | self = netdev_priv(dev); | 982 | self = netdev_priv(dev); |
983 | 983 | ||
984 | IRDA_ASSERT (self != NULL, return 0; ); | 984 | IRDA_ASSERT (self != NULL, return NETDEV_TX_OK; ); |
985 | 985 | ||
986 | IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __func__ | 986 | IRDA_DEBUG (1, "%s.tx:%x(%x)%x\n", __func__ |
987 | ,skb->len,self->txpending,INB (OBOE_ENABLEH)); | 987 | ,skb->len,self->txpending,INB (OBOE_ENABLEH)); |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 05bfc987b34b..51ca89c9a0ba 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
@@ -1365,7 +1365,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
1365 | 1365 | ||
1366 | self = netdev_priv(dev); | 1366 | self = netdev_priv(dev); |
1367 | 1367 | ||
1368 | IRDA_ASSERT(self != NULL, return 0;); | 1368 | IRDA_ASSERT(self != NULL, return NETDEV_TX_OK;); |
1369 | 1369 | ||
1370 | iobase = self->io.fir_base; | 1370 | iobase = self->io.fir_base; |
1371 | 1371 | ||
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index bde004f0a7a3..71dce20e62be 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
@@ -590,7 +590,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
590 | int err; | 590 | int err; |
591 | s32 speed; | 591 | s32 speed; |
592 | 592 | ||
593 | IRDA_ASSERT(dev != NULL, return 0;); | 593 | IRDA_ASSERT(dev != NULL, return NETDEV_TX_OK;); |
594 | 594 | ||
595 | netif_stop_queue(ndev); | 595 | netif_stop_queue(ndev); |
596 | 596 | ||
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index d0797adb5f8e..15f8a7f81600 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
@@ -886,10 +886,10 @@ static int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
886 | 886 | ||
887 | IRDA_DEBUG(1, "%s\n", __func__); | 887 | IRDA_DEBUG(1, "%s\n", __func__); |
888 | 888 | ||
889 | IRDA_ASSERT(dev != NULL, return 0;); | 889 | IRDA_ASSERT(dev != NULL, return NETDEV_TX_OK;); |
890 | 890 | ||
891 | self = netdev_priv(dev); | 891 | self = netdev_priv(dev); |
892 | IRDA_ASSERT(self != NULL, return 0;); | 892 | IRDA_ASSERT(self != NULL, return NETDEV_TX_OK;); |
893 | 893 | ||
894 | netif_stop_queue(dev); | 894 | netif_stop_queue(dev); |
895 | 895 | ||
@@ -914,7 +914,7 @@ static int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
914 | smsc_ircc_change_speed(self, speed); | 914 | smsc_ircc_change_speed(self, speed); |
915 | spin_unlock_irqrestore(&self->lock, flags); | 915 | spin_unlock_irqrestore(&self->lock, flags); |
916 | dev_kfree_skb(skb); | 916 | dev_kfree_skb(skb); |
917 | return 0; | 917 | return NETDEV_TX_OK; |
918 | } | 918 | } |
919 | self->new_speed = speed; | 919 | self->new_speed = speed; |
920 | } | 920 | } |
@@ -935,7 +935,7 @@ static int smsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev) | |||
935 | 935 | ||
936 | dev_kfree_skb(skb); | 936 | dev_kfree_skb(skb); |
937 | 937 | ||
938 | return 0; | 938 | return NETDEV_TX_OK; |
939 | } | 939 | } |
940 | 940 | ||
941 | /* | 941 | /* |
@@ -1190,9 +1190,9 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | |||
1190 | s32 speed; | 1190 | s32 speed; |
1191 | int mtt; | 1191 | int mtt; |
1192 | 1192 | ||
1193 | IRDA_ASSERT(dev != NULL, return 0;); | 1193 | IRDA_ASSERT(dev != NULL, return NETDEV_TX_OK;); |
1194 | self = netdev_priv(dev); | 1194 | self = netdev_priv(dev); |
1195 | IRDA_ASSERT(self != NULL, return 0;); | 1195 | IRDA_ASSERT(self != NULL, return NETDEV_TX_OK;); |
1196 | 1196 | ||
1197 | netif_stop_queue(dev); | 1197 | netif_stop_queue(dev); |
1198 | 1198 | ||
@@ -1210,7 +1210,7 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | |||
1210 | smsc_ircc_change_speed(self, speed); | 1210 | smsc_ircc_change_speed(self, speed); |
1211 | spin_unlock_irqrestore(&self->lock, flags); | 1211 | spin_unlock_irqrestore(&self->lock, flags); |
1212 | dev_kfree_skb(skb); | 1212 | dev_kfree_skb(skb); |
1213 | return 0; | 1213 | return NETDEV_TX_OK; |
1214 | } | 1214 | } |
1215 | 1215 | ||
1216 | self->new_speed = speed; | 1216 | self->new_speed = speed; |
@@ -1242,7 +1242,7 @@ static int smsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) | |||
1242 | spin_unlock_irqrestore(&self->lock, flags); | 1242 | spin_unlock_irqrestore(&self->lock, flags); |
1243 | dev_kfree_skb(skb); | 1243 | dev_kfree_skb(skb); |
1244 | 1244 | ||
1245 | return 0; | 1245 | return NETDEV_TX_OK; |
1246 | } | 1246 | } |
1247 | 1247 | ||
1248 | /* | 1248 | /* |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 62ba94ba7c9e..36a60748447b 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
@@ -832,7 +832,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb, | |||
832 | __u32 speed; | 832 | __u32 speed; |
833 | 833 | ||
834 | self = netdev_priv(dev); | 834 | self = netdev_priv(dev); |
835 | IRDA_ASSERT(self != NULL, return 0;); | 835 | IRDA_ASSERT(self != NULL, return NETDEV_TX_OK;); |
836 | iobase = self->io.fir_base; | 836 | iobase = self->io.fir_base; |
837 | 837 | ||
838 | netif_stop_queue(dev); | 838 | netif_stop_queue(dev); |