aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/irda
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2009-06-23 02:03:08 -0400
committerDavid S. Miller <davem@davemloft.net>2009-07-05 22:16:04 -0400
commit6ed106549d17474ca17a16057f4c0ed4eba5a7ca (patch)
treeb98c09081509b3a9757339b6b66779e4126dfa29 /drivers/net/irda
parent0e8635a8e1f2d4a9e1bfc6c3b21419a5921e674f (diff)
net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions
This patch is the result of an automatic spatch transformation to convert all ndo_start_xmit() return values of 0 to NETDEV_TX_OK. Some occurences are missed by the automatic conversion, those will be handled in a seperate patch. 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.c8
-rw-r--r--drivers/net/irda/au1k_ir.c4
-rw-r--r--drivers/net/irda/donauboe.c6
-rw-r--r--drivers/net/irda/irda-usb.c2
-rw-r--r--drivers/net/irda/nsc-ircc.c8
-rw-r--r--drivers/net/irda/pxaficp_ir.c4
-rw-r--r--drivers/net/irda/sa1100_ir.c4
-rw-r--r--drivers/net/irda/sir_dev.c4
-rw-r--r--drivers/net/irda/stir4200.c2
-rw-r--r--drivers/net/irda/via-ircc.c10
-rw-r--r--drivers/net/irda/vlsi_ir.c6
-rw-r--r--drivers/net/irda/w83977af_ir.c4
12 files changed, 31 insertions, 31 deletions
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c
index ad1795580028..709835782443 100644
--- a/drivers/net/irda/ali-ircc.c
+++ b/drivers/net/irda/ali-ircc.c
@@ -1466,7 +1466,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
1466 dev->trans_start = jiffies; 1466 dev->trans_start = jiffies;
1467 spin_unlock_irqrestore(&self->lock, flags); 1467 spin_unlock_irqrestore(&self->lock, flags);
1468 dev_kfree_skb(skb); 1468 dev_kfree_skb(skb);
1469 return 0; 1469 return NETDEV_TX_OK;
1470 } else 1470 } else
1471 self->new_speed = speed; 1471 self->new_speed = speed;
1472 } 1472 }
@@ -1577,7 +1577,7 @@ static int ali_ircc_fir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
1577 dev_kfree_skb(skb); 1577 dev_kfree_skb(skb);
1578 1578
1579 IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ ); 1579 IRDA_DEBUG(1, "%s(), ----------------- End ------------------\n", __func__ );
1580 return 0; 1580 return NETDEV_TX_OK;
1581} 1581}
1582 1582
1583 1583
@@ -1991,7 +1991,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
1991 dev->trans_start = jiffies; 1991 dev->trans_start = jiffies;
1992 spin_unlock_irqrestore(&self->lock, flags); 1992 spin_unlock_irqrestore(&self->lock, flags);
1993 dev_kfree_skb(skb); 1993 dev_kfree_skb(skb);
1994 return 0; 1994 return NETDEV_TX_OK;
1995 } else 1995 } else
1996 self->new_speed = speed; 1996 self->new_speed = speed;
1997 } 1997 }
@@ -2015,7 +2015,7 @@ static int ali_ircc_sir_hard_xmit(struct sk_buff *skb, struct net_device *dev)
2015 2015
2016 IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ ); 2016 IRDA_DEBUG(2, "%s(), ----------------- End ------------------\n", __func__ );
2017 2017
2018 return 0; 2018 return NETDEV_TX_OK;
2019} 2019}
2020 2020
2021 2021
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c
index c4361d466597..22baf65e1563 100644
--- a/drivers/net/irda/au1k_ir.c
+++ b/drivers/net/irda/au1k_ir.c
@@ -502,7 +502,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
502 aup->newspeed = 0; 502 aup->newspeed = 0;
503 } 503 }
504 dev_kfree_skb(skb); 504 dev_kfree_skb(skb);
505 return 0; 505 return NETDEV_TX_OK;
506 } 506 }
507 507
508 ptxd = aup->tx_ring[aup->tx_head]; 508 ptxd = aup->tx_ring[aup->tx_head];
@@ -555,7 +555,7 @@ static int au1k_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
555 dev_kfree_skb(skb); 555 dev_kfree_skb(skb);
556 aup->tx_head = (aup->tx_head + 1) & (NUM_IR_DESC - 1); 556 aup->tx_head = (aup->tx_head + 1) & (NUM_IR_DESC - 1);
557 dev->trans_start = jiffies; 557 dev->trans_start = jiffies;
558 return 0; 558 return NETDEV_TX_OK;
559} 559}
560 560
561 561
diff --git a/drivers/net/irda/donauboe.c b/drivers/net/irda/donauboe.c
index 9a0346e751ac..1484c76becfb 100644
--- a/drivers/net/irda/donauboe.c
+++ b/drivers/net/irda/donauboe.c
@@ -1021,7 +1021,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
1021 { 1021 {
1022 spin_unlock_irqrestore(&self->spinlock, flags); 1022 spin_unlock_irqrestore(&self->spinlock, flags);
1023 dev_kfree_skb (skb); 1023 dev_kfree_skb (skb);
1024 return 0; 1024 return NETDEV_TX_OK;
1025 } 1025 }
1026 /* True packet, go on, but */ 1026 /* True packet, go on, but */
1027 /* do not accept anything before change speed execution */ 1027 /* do not accept anything before change speed execution */
@@ -1036,7 +1036,7 @@ toshoboe_hard_xmit (struct sk_buff *skb, struct net_device *dev)
1036 toshoboe_setbaud (self); 1036 toshoboe_setbaud (self);
1037 spin_unlock_irqrestore(&self->spinlock, flags); 1037 spin_unlock_irqrestore(&self->spinlock, flags);
1038 dev_kfree_skb (skb); 1038 dev_kfree_skb (skb);
1039 return 0; 1039 return NETDEV_TX_OK;
1040 } 1040 }
1041 1041
1042 } 1042 }
@@ -1143,7 +1143,7 @@ dumpbufs(skb->data,skb->len,'>');
1143 spin_unlock_irqrestore(&self->spinlock, flags); 1143 spin_unlock_irqrestore(&self->spinlock, flags);
1144 dev_kfree_skb (skb); 1144 dev_kfree_skb (skb);
1145 1145
1146 return 0; 1146 return NETDEV_TX_OK;
1147} 1147}
1148 1148
1149/*interrupt handler */ 1149/*interrupt handler */
diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 0c0831c03f64..6a1aa7a40fe2 100644
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -534,7 +534,7 @@ static int irda_usb_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
534 } 534 }
535 spin_unlock_irqrestore(&self->lock, flags); 535 spin_unlock_irqrestore(&self->lock, flags);
536 536
537 return 0; 537 return NETDEV_TX_OK;
538 538
539drop: 539drop:
540 /* Drop silently the skb and exit */ 540 /* Drop silently the skb and exit */
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c
index 45fd9c1eb343..05bfc987b34b 100644
--- a/drivers/net/irda/nsc-ircc.c
+++ b/drivers/net/irda/nsc-ircc.c
@@ -1397,7 +1397,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
1397 dev->trans_start = jiffies; 1397 dev->trans_start = jiffies;
1398 spin_unlock_irqrestore(&self->lock, flags); 1398 spin_unlock_irqrestore(&self->lock, flags);
1399 dev_kfree_skb(skb); 1399 dev_kfree_skb(skb);
1400 return 0; 1400 return NETDEV_TX_OK;
1401 } else 1401 } else
1402 self->new_speed = speed; 1402 self->new_speed = speed;
1403 } 1403 }
@@ -1424,7 +1424,7 @@ static int nsc_ircc_hard_xmit_sir(struct sk_buff *skb, struct net_device *dev)
1424 1424
1425 dev_kfree_skb(skb); 1425 dev_kfree_skb(skb);
1426 1426
1427 return 0; 1427 return NETDEV_TX_OK;
1428} 1428}
1429 1429
1430static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev) 1430static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
@@ -1467,7 +1467,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
1467 dev->trans_start = jiffies; 1467 dev->trans_start = jiffies;
1468 spin_unlock_irqrestore(&self->lock, flags); 1468 spin_unlock_irqrestore(&self->lock, flags);
1469 dev_kfree_skb(skb); 1469 dev_kfree_skb(skb);
1470 return 0; 1470 return NETDEV_TX_OK;
1471 } else { 1471 } else {
1472 /* Change speed after current frame */ 1472 /* Change speed after current frame */
1473 self->new_speed = speed; 1473 self->new_speed = speed;
@@ -1554,7 +1554,7 @@ static int nsc_ircc_hard_xmit_fir(struct sk_buff *skb, struct net_device *dev)
1554 spin_unlock_irqrestore(&self->lock, flags); 1554 spin_unlock_irqrestore(&self->lock, flags);
1555 dev_kfree_skb(skb); 1555 dev_kfree_skb(skb);
1556 1556
1557 return 0; 1557 return NETDEV_TX_OK;
1558} 1558}
1559 1559
1560/* 1560/*
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c
index 3376a4f39e0a..e76a083f901a 100644
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@ -504,7 +504,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
504 pxa_irda_set_speed(si, speed); 504 pxa_irda_set_speed(si, speed);
505 } 505 }
506 dev_kfree_skb(skb); 506 dev_kfree_skb(skb);
507 return 0; 507 return NETDEV_TX_OK;
508 } 508 }
509 509
510 netif_stop_queue(dev); 510 netif_stop_queue(dev);
@@ -539,7 +539,7 @@ static int pxa_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
539 539
540 dev_kfree_skb(skb); 540 dev_kfree_skb(skb);
541 dev->trans_start = jiffies; 541 dev->trans_start = jiffies;
542 return 0; 542 return NETDEV_TX_OK;
543} 543}
544 544
545static int pxa_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd) 545static int pxa_irda_ioctl(struct net_device *dev, struct ifreq *ifreq, int cmd)
diff --git a/drivers/net/irda/sa1100_ir.c b/drivers/net/irda/sa1100_ir.c
index 2aeb2e6aec1b..70e6acc597b0 100644
--- a/drivers/net/irda/sa1100_ir.c
+++ b/drivers/net/irda/sa1100_ir.c
@@ -667,7 +667,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
667 sa1100_irda_set_speed(si, speed); 667 sa1100_irda_set_speed(si, speed);
668 } 668 }
669 dev_kfree_skb(skb); 669 dev_kfree_skb(skb);
670 return 0; 670 return NETDEV_TX_OK;
671 } 671 }
672 672
673 if (!IS_FIR(si)) { 673 if (!IS_FIR(si)) {
@@ -715,7 +715,7 @@ static int sa1100_irda_hard_xmit(struct sk_buff *skb, struct net_device *dev)
715 715
716 dev->trans_start = jiffies; 716 dev->trans_start = jiffies;
717 717
718 return 0; 718 return NETDEV_TX_OK;
719} 719}
720 720
721static int 721static int
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c
index fd0796c3db3c..bde004f0a7a3 100644
--- a/drivers/net/irda/sir_dev.c
+++ b/drivers/net/irda/sir_dev.c
@@ -621,7 +621,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
621 */ 621 */
622 622
623 dev_kfree_skb_any(skb); 623 dev_kfree_skb_any(skb);
624 return 0; 624 return NETDEV_TX_OK;
625 } else 625 } else
626 dev->new_speed = speed; 626 dev->new_speed = speed;
627 } 627 }
@@ -668,7 +668,7 @@ static int sirdev_hard_xmit(struct sk_buff *skb, struct net_device *ndev)
668 } 668 }
669 spin_unlock_irqrestore(&dev->tx_lock, flags); 669 spin_unlock_irqrestore(&dev->tx_lock, flags);
670 670
671 return 0; 671 return NETDEV_TX_OK;
672} 672}
673 673
674/* called from network layer with rtnl hold */ 674/* called from network layer with rtnl hold */
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c
index 8e5e45caf2f1..c475b23091bc 100644
--- a/drivers/net/irda/stir4200.c
+++ b/drivers/net/irda/stir4200.c
@@ -578,7 +578,7 @@ static int stir_hard_xmit(struct sk_buff *skb, struct net_device *netdev)
578 dev_kfree_skb(skb); 578 dev_kfree_skb(skb);
579 } 579 }
580 580
581 return 0; 581 return NETDEV_TX_OK;
582} 582}
583 583
584/* 584/*
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c
index 864798502ff9..62ba94ba7c9e 100644
--- a/drivers/net/irda/via-ircc.c
+++ b/drivers/net/irda/via-ircc.c
@@ -844,7 +844,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb,
844 via_ircc_change_speed(self, speed); 844 via_ircc_change_speed(self, speed);
845 dev->trans_start = jiffies; 845 dev->trans_start = jiffies;
846 dev_kfree_skb(skb); 846 dev_kfree_skb(skb);
847 return 0; 847 return NETDEV_TX_OK;
848 } else 848 } else
849 self->new_speed = speed; 849 self->new_speed = speed;
850 } 850 }
@@ -892,7 +892,7 @@ static int via_ircc_hard_xmit_sir(struct sk_buff *skb,
892 dev->trans_start = jiffies; 892 dev->trans_start = jiffies;
893 spin_unlock_irqrestore(&self->lock, flags); 893 spin_unlock_irqrestore(&self->lock, flags);
894 dev_kfree_skb(skb); 894 dev_kfree_skb(skb);
895 return 0; 895 return NETDEV_TX_OK;
896} 896}
897 897
898static int via_ircc_hard_xmit_fir(struct sk_buff *skb, 898static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
@@ -907,7 +907,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
907 iobase = self->io.fir_base; 907 iobase = self->io.fir_base;
908 908
909 if (self->st_fifo.len) 909 if (self->st_fifo.len)
910 return 0; 910 return NETDEV_TX_OK;
911 if (self->chip_id == 0x3076) 911 if (self->chip_id == 0x3076)
912 iodelay(1500); 912 iodelay(1500);
913 else 913 else
@@ -919,7 +919,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
919 via_ircc_change_speed(self, speed); 919 via_ircc_change_speed(self, speed);
920 dev->trans_start = jiffies; 920 dev->trans_start = jiffies;
921 dev_kfree_skb(skb); 921 dev_kfree_skb(skb);
922 return 0; 922 return NETDEV_TX_OK;
923 } else 923 } else
924 self->new_speed = speed; 924 self->new_speed = speed;
925 } 925 }
@@ -940,7 +940,7 @@ static int via_ircc_hard_xmit_fir(struct sk_buff *skb,
940 dev->trans_start = jiffies; 940 dev->trans_start = jiffies;
941 dev_kfree_skb(skb); 941 dev_kfree_skb(skb);
942 spin_unlock_irqrestore(&self->lock, flags); 942 spin_unlock_irqrestore(&self->lock, flags);
943 return 0; 943 return NETDEV_TX_OK;
944 944
945} 945}
946 946
diff --git a/drivers/net/irda/vlsi_ir.c b/drivers/net/irda/vlsi_ir.c
index ac0e4b6b6b66..08e26f1297b4 100644
--- a/drivers/net/irda/vlsi_ir.c
+++ b/drivers/net/irda/vlsi_ir.c
@@ -915,7 +915,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
915 */ 915 */
916 spin_unlock_irqrestore(&idev->lock, flags); 916 spin_unlock_irqrestore(&idev->lock, flags);
917 dev_kfree_skb_any(skb); 917 dev_kfree_skb_any(skb);
918 return 0; 918 return NETDEV_TX_OK;
919 } 919 }
920 920
921 /* sanity checks - simply drop the packet */ 921 /* sanity checks - simply drop the packet */
@@ -1044,7 +1044,7 @@ static int vlsi_hard_start_xmit(struct sk_buff *skb, struct net_device *ndev)
1044 } 1044 }
1045 spin_unlock_irqrestore(&idev->lock, flags); 1045 spin_unlock_irqrestore(&idev->lock, flags);
1046 1046
1047 return 0; 1047 return NETDEV_TX_OK;
1048 1048
1049drop_unlock: 1049drop_unlock:
1050 spin_unlock_irqrestore(&idev->lock, flags); 1050 spin_unlock_irqrestore(&idev->lock, flags);
@@ -1058,7 +1058,7 @@ drop:
1058 * packet for later retry of transmission - which isn't exactly 1058 * packet for later retry of transmission - which isn't exactly
1059 * what we want after we've just called dev_kfree_skb_any ;-) 1059 * what we want after we've just called dev_kfree_skb_any ;-)
1060 */ 1060 */
1061 return 0; 1061 return NETDEV_TX_OK;
1062} 1062}
1063 1063
1064static void vlsi_tx_interrupt(struct net_device *ndev) 1064static void vlsi_tx_interrupt(struct net_device *ndev)
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c
index d0883835b0c6..49ef76320f51 100644
--- a/drivers/net/irda/w83977af_ir.c
+++ b/drivers/net/irda/w83977af_ir.c
@@ -516,7 +516,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
516 w83977af_change_speed(self, speed); 516 w83977af_change_speed(self, speed);
517 dev->trans_start = jiffies; 517 dev->trans_start = jiffies;
518 dev_kfree_skb(skb); 518 dev_kfree_skb(skb);
519 return 0; 519 return NETDEV_TX_OK;
520 } else 520 } else
521 self->new_speed = speed; 521 self->new_speed = speed;
522 } 522 }
@@ -576,7 +576,7 @@ static int w83977af_hard_xmit(struct sk_buff *skb, struct net_device *dev)
576 /* Restore set register */ 576 /* Restore set register */
577 outb(set, iobase+SSR); 577 outb(set, iobase+SSR);
578 578
579 return 0; 579 return NETDEV_TX_OK;
580} 580}
581 581
582/* 582/*