diff options
author | Chunyan Zhang <zhang.chunyan@linaro.org> | 2015-01-07 23:01:27 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-11 21:39:40 -0500 |
commit | 270d73c1c32c71e215f1c64e70be82063ec65005 (patch) | |
tree | 17bd55501e42771a1f947481a4d208e3b5c6fd0f | |
parent | f3cd7a264bb001a701e68c7234a3b1cdb3a83f5f (diff) |
irda: Removed all unused timeval variables
In the file au1k_ir.c & via-ircc.h, there were two unused definitions of the
timeval type members, this commit therefore removes this unneeded code.
In other three files, the same problem is the rx_time member is only ever
written, never read, so removed it entirely.
Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/irda/au1k_ir.c | 3 | ||||
-rw-r--r-- | drivers/net/irda/kingsun-sir.c | 3 | ||||
-rw-r--r-- | drivers/net/irda/ks959-sir.c | 3 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.c | 2 | ||||
-rw-r--r-- | drivers/net/irda/mcs7780.h | 1 | ||||
-rw-r--r-- | drivers/net/irda/via-ircc.h | 4 |
6 files changed, 0 insertions, 16 deletions
diff --git a/drivers/net/irda/au1k_ir.c b/drivers/net/irda/au1k_ir.c index e151205281e2..44e4f386a5dc 100644 --- a/drivers/net/irda/au1k_ir.c +++ b/drivers/net/irda/au1k_ir.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
26 | #include <linux/slab.h> | 26 | #include <linux/slab.h> |
27 | #include <linux/time.h> | ||
28 | #include <linux/types.h> | 27 | #include <linux/types.h> |
29 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
30 | 29 | ||
@@ -163,8 +162,6 @@ struct au1k_private { | |||
163 | iobuff_t rx_buff; | 162 | iobuff_t rx_buff; |
164 | 163 | ||
165 | struct net_device *netdev; | 164 | struct net_device *netdev; |
166 | struct timeval stamp; | ||
167 | struct timeval now; | ||
168 | struct qos_info qos; | 165 | struct qos_info qos; |
169 | struct irlap_cb *irlap; | 166 | struct irlap_cb *irlap; |
170 | 167 | ||
diff --git a/drivers/net/irda/kingsun-sir.c b/drivers/net/irda/kingsun-sir.c index e638893e98a9..fb5d162ec7d2 100644 --- a/drivers/net/irda/kingsun-sir.c +++ b/drivers/net/irda/kingsun-sir.c | |||
@@ -114,7 +114,6 @@ struct kingsun_cb { | |||
114 | (usually 8) */ | 114 | (usually 8) */ |
115 | 115 | ||
116 | iobuff_t rx_buff; /* receive unwrap state machine */ | 116 | iobuff_t rx_buff; /* receive unwrap state machine */ |
117 | struct timeval rx_time; | ||
118 | spinlock_t lock; | 117 | spinlock_t lock; |
119 | int receiving; | 118 | int receiving; |
120 | 119 | ||
@@ -235,7 +234,6 @@ static void kingsun_rcv_irq(struct urb *urb) | |||
235 | &kingsun->netdev->stats, | 234 | &kingsun->netdev->stats, |
236 | &kingsun->rx_buff, bytes[i]); | 235 | &kingsun->rx_buff, bytes[i]); |
237 | } | 236 | } |
238 | do_gettimeofday(&kingsun->rx_time); | ||
239 | kingsun->receiving = | 237 | kingsun->receiving = |
240 | (kingsun->rx_buff.state != OUTSIDE_FRAME) | 238 | (kingsun->rx_buff.state != OUTSIDE_FRAME) |
241 | ? 1 : 0; | 239 | ? 1 : 0; |
@@ -273,7 +271,6 @@ static int kingsun_net_open(struct net_device *netdev) | |||
273 | 271 | ||
274 | skb_reserve(kingsun->rx_buff.skb, 1); | 272 | skb_reserve(kingsun->rx_buff.skb, 1); |
275 | kingsun->rx_buff.head = kingsun->rx_buff.skb->data; | 273 | kingsun->rx_buff.head = kingsun->rx_buff.skb->data; |
276 | do_gettimeofday(&kingsun->rx_time); | ||
277 | 274 | ||
278 | kingsun->rx_urb = usb_alloc_urb(0, GFP_KERNEL); | 275 | kingsun->rx_urb = usb_alloc_urb(0, GFP_KERNEL); |
279 | if (!kingsun->rx_urb) | 276 | if (!kingsun->rx_urb) |
diff --git a/drivers/net/irda/ks959-sir.c b/drivers/net/irda/ks959-sir.c index e6b3804edacd..8e6e0edf2440 100644 --- a/drivers/net/irda/ks959-sir.c +++ b/drivers/net/irda/ks959-sir.c | |||
@@ -187,7 +187,6 @@ struct ks959_cb { | |||
187 | __u8 *rx_buf; | 187 | __u8 *rx_buf; |
188 | __u8 rx_variable_xormask; | 188 | __u8 rx_variable_xormask; |
189 | iobuff_t rx_unwrap_buff; | 189 | iobuff_t rx_unwrap_buff; |
190 | struct timeval rx_time; | ||
191 | 190 | ||
192 | struct usb_ctrlrequest *speed_setuprequest; | 191 | struct usb_ctrlrequest *speed_setuprequest; |
193 | struct urb *speed_urb; | 192 | struct urb *speed_urb; |
@@ -476,7 +475,6 @@ static void ks959_rcv_irq(struct urb *urb) | |||
476 | bytes[i]); | 475 | bytes[i]); |
477 | } | 476 | } |
478 | } | 477 | } |
479 | do_gettimeofday(&kingsun->rx_time); | ||
480 | kingsun->receiving = | 478 | kingsun->receiving = |
481 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; | 479 | (kingsun->rx_unwrap_buff.state != OUTSIDE_FRAME) ? 1 : 0; |
482 | } | 480 | } |
@@ -514,7 +512,6 @@ static int ks959_net_open(struct net_device *netdev) | |||
514 | 512 | ||
515 | skb_reserve(kingsun->rx_unwrap_buff.skb, 1); | 513 | skb_reserve(kingsun->rx_unwrap_buff.skb, 1); |
516 | kingsun->rx_unwrap_buff.head = kingsun->rx_unwrap_buff.skb->data; | 514 | kingsun->rx_unwrap_buff.head = kingsun->rx_unwrap_buff.skb->data; |
517 | do_gettimeofday(&kingsun->rx_time); | ||
518 | 515 | ||
519 | kingsun->rx_urb = usb_alloc_urb(0, GFP_KERNEL); | 516 | kingsun->rx_urb = usb_alloc_urb(0, GFP_KERNEL); |
520 | if (!kingsun->rx_urb) | 517 | if (!kingsun->rx_urb) |
diff --git a/drivers/net/irda/mcs7780.c b/drivers/net/irda/mcs7780.c index e4d678fbeb2f..bca6a1e72d1d 100644 --- a/drivers/net/irda/mcs7780.c +++ b/drivers/net/irda/mcs7780.c | |||
@@ -722,7 +722,6 @@ static int mcs_net_open(struct net_device *netdev) | |||
722 | 722 | ||
723 | skb_reserve(mcs->rx_buff.skb, 1); | 723 | skb_reserve(mcs->rx_buff.skb, 1); |
724 | mcs->rx_buff.head = mcs->rx_buff.skb->data; | 724 | mcs->rx_buff.head = mcs->rx_buff.skb->data; |
725 | do_gettimeofday(&mcs->rx_time); | ||
726 | 725 | ||
727 | /* | 726 | /* |
728 | * Now that everything should be initialized properly, | 727 | * Now that everything should be initialized properly, |
@@ -799,7 +798,6 @@ static void mcs_receive_irq(struct urb *urb) | |||
799 | mcs_unwrap_fir(mcs, urb->transfer_buffer, | 798 | mcs_unwrap_fir(mcs, urb->transfer_buffer, |
800 | urb->actual_length); | 799 | urb->actual_length); |
801 | } | 800 | } |
802 | do_gettimeofday(&mcs->rx_time); | ||
803 | } | 801 | } |
804 | 802 | ||
805 | ret = usb_submit_urb(urb, GFP_ATOMIC); | 803 | ret = usb_submit_urb(urb, GFP_ATOMIC); |
diff --git a/drivers/net/irda/mcs7780.h b/drivers/net/irda/mcs7780.h index b10689b2887c..a6e8f7dbafc9 100644 --- a/drivers/net/irda/mcs7780.h +++ b/drivers/net/irda/mcs7780.h | |||
@@ -116,7 +116,6 @@ struct mcs_cb { | |||
116 | __u8 *fifo_status; | 116 | __u8 *fifo_status; |
117 | 117 | ||
118 | iobuff_t rx_buff; /* receive unwrap state machine */ | 118 | iobuff_t rx_buff; /* receive unwrap state machine */ |
119 | struct timeval rx_time; | ||
120 | spinlock_t lock; | 119 | spinlock_t lock; |
121 | int receiving; | 120 | int receiving; |
122 | 121 | ||
diff --git a/drivers/net/irda/via-ircc.h b/drivers/net/irda/via-ircc.h index 7ce820ecc361..ac1525573398 100644 --- a/drivers/net/irda/via-ircc.h +++ b/drivers/net/irda/via-ircc.h | |||
@@ -29,7 +29,6 @@ this program; if not, see <http://www.gnu.org/licenses/>. | |||
29 | ********************************************************************/ | 29 | ********************************************************************/ |
30 | #ifndef via_IRCC_H | 30 | #ifndef via_IRCC_H |
31 | #define via_IRCC_H | 31 | #define via_IRCC_H |
32 | #include <linux/time.h> | ||
33 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
34 | #include <linux/pm.h> | 33 | #include <linux/pm.h> |
35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
@@ -106,9 +105,6 @@ struct via_ircc_cb { | |||
106 | 105 | ||
107 | __u8 ier; /* Interrupt enable register */ | 106 | __u8 ier; /* Interrupt enable register */ |
108 | 107 | ||
109 | struct timeval stamp; | ||
110 | struct timeval now; | ||
111 | |||
112 | spinlock_t lock; /* For serializing operations */ | 108 | spinlock_t lock; /* For serializing operations */ |
113 | 109 | ||
114 | __u32 flags; /* Interface flags */ | 110 | __u32 flags; /* Interface flags */ |