diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-23 03:04:19 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:07 -0400 |
commit | fc5fef615a963c8b13abf0bbc2a8e8d7c3fd1ffb (patch) | |
tree | 614f9fe99a8005afb6be1e97e4bd1c9f281512e5 /drivers | |
parent | 6039aa73a1323edc2d6d93a22505d4dc28f38e3f (diff) |
Bluetooth: Remove 'register' usage from the subsystem
Let the compiler chooses what is best.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/bluetooth/bluecard_cs.c | 10 | ||||
-rw-r--r-- | drivers/bluetooth/bt3c_cs.c | 4 | ||||
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 4 | ||||
-rw-r--r-- | drivers/bluetooth/dtl1_cs.c | 4 | ||||
-rw-r--r-- | drivers/bluetooth/hci_bcsp.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/hci_h4.c | 2 | ||||
-rw-r--r-- | drivers/bluetooth/hci_ll.c | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c index 1fcd92380356..585c88e01893 100644 --- a/drivers/bluetooth/bluecard_cs.c +++ b/drivers/bluetooth/bluecard_cs.c | |||
@@ -231,12 +231,12 @@ static void bluecard_write_wakeup(bluecard_info_t *info) | |||
231 | } | 231 | } |
232 | 232 | ||
233 | do { | 233 | do { |
234 | register unsigned int iobase = info->p_dev->resource[0]->start; | 234 | unsigned int iobase = info->p_dev->resource[0]->start; |
235 | register unsigned int offset; | 235 | unsigned int offset; |
236 | register unsigned char command; | 236 | unsigned char command; |
237 | register unsigned long ready_bit; | 237 | unsigned long ready_bit; |
238 | register struct sk_buff *skb; | 238 | register struct sk_buff *skb; |
239 | register int len; | 239 | int len; |
240 | 240 | ||
241 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); | 241 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); |
242 | 242 | ||
diff --git a/drivers/bluetooth/bt3c_cs.c b/drivers/bluetooth/bt3c_cs.c index 308c8599ab55..b2b0fbbb43b5 100644 --- a/drivers/bluetooth/bt3c_cs.c +++ b/drivers/bluetooth/bt3c_cs.c | |||
@@ -186,9 +186,9 @@ static void bt3c_write_wakeup(bt3c_info_t *info) | |||
186 | return; | 186 | return; |
187 | 187 | ||
188 | do { | 188 | do { |
189 | register unsigned int iobase = info->p_dev->resource[0]->start; | 189 | unsigned int iobase = info->p_dev->resource[0]->start; |
190 | register struct sk_buff *skb; | 190 | register struct sk_buff *skb; |
191 | register int len; | 191 | int len; |
192 | 192 | ||
193 | if (!pcmcia_dev_present(info->p_dev)) | 193 | if (!pcmcia_dev_present(info->p_dev)) |
194 | break; | 194 | break; |
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index c4fc2f3fc32c..65b8d996840c 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -140,9 +140,9 @@ static void btuart_write_wakeup(btuart_info_t *info) | |||
140 | } | 140 | } |
141 | 141 | ||
142 | do { | 142 | do { |
143 | register unsigned int iobase = info->p_dev->resource[0]->start; | 143 | unsigned int iobase = info->p_dev->resource[0]->start; |
144 | register struct sk_buff *skb; | 144 | register struct sk_buff *skb; |
145 | register int len; | 145 | int len; |
146 | 146 | ||
147 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); | 147 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); |
148 | 148 | ||
diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c index 6e8d96189684..b1b37ccd3cd4 100644 --- a/drivers/bluetooth/dtl1_cs.c +++ b/drivers/bluetooth/dtl1_cs.c | |||
@@ -144,9 +144,9 @@ static void dtl1_write_wakeup(dtl1_info_t *info) | |||
144 | } | 144 | } |
145 | 145 | ||
146 | do { | 146 | do { |
147 | register unsigned int iobase = info->p_dev->resource[0]->start; | 147 | unsigned int iobase = info->p_dev->resource[0]->start; |
148 | register struct sk_buff *skb; | 148 | register struct sk_buff *skb; |
149 | register int len; | 149 | int len; |
150 | 150 | ||
151 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); | 151 | clear_bit(XMIT_WAKEUP, &(info->tx_state)); |
152 | 152 | ||
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 661a8dc4d2f8..57e502e06080 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c | |||
@@ -552,7 +552,7 @@ static u16 bscp_get_crc(struct bcsp_struct *bcsp) | |||
552 | static int bcsp_recv(struct hci_uart *hu, void *data, int count) | 552 | static int bcsp_recv(struct hci_uart *hu, void *data, int count) |
553 | { | 553 | { |
554 | struct bcsp_struct *bcsp = hu->priv; | 554 | struct bcsp_struct *bcsp = hu->priv; |
555 | register unsigned char *ptr; | 555 | unsigned char *ptr; |
556 | 556 | ||
557 | BT_DBG("hu %p count %d rx_state %d rx_count %ld", | 557 | BT_DBG("hu %p count %d rx_state %d rx_count %ld", |
558 | hu, count, bcsp->rx_state, bcsp->rx_count); | 558 | hu, count, bcsp->rx_state, bcsp->rx_count); |
diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c index 748329468d26..c60623f206d4 100644 --- a/drivers/bluetooth/hci_h4.c +++ b/drivers/bluetooth/hci_h4.c | |||
@@ -126,7 +126,7 @@ static int h4_enqueue(struct hci_uart *hu, struct sk_buff *skb) | |||
126 | 126 | ||
127 | static inline int h4_check_data_len(struct h4_struct *h4, int len) | 127 | static inline int h4_check_data_len(struct h4_struct *h4, int len) |
128 | { | 128 | { |
129 | register int room = skb_tailroom(h4->rx_skb); | 129 | int room = skb_tailroom(h4->rx_skb); |
130 | 130 | ||
131 | BT_DBG("len %d room %d", len, room); | 131 | BT_DBG("len %d room %d", len, room); |
132 | 132 | ||
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index b874c0efde24..ff6d589c34a5 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c | |||
@@ -348,7 +348,7 @@ static int ll_enqueue(struct hci_uart *hu, struct sk_buff *skb) | |||
348 | 348 | ||
349 | static inline int ll_check_data_len(struct ll_struct *ll, int len) | 349 | static inline int ll_check_data_len(struct ll_struct *ll, int len) |
350 | { | 350 | { |
351 | register int room = skb_tailroom(ll->rx_skb); | 351 | int room = skb_tailroom(ll->rx_skb); |
352 | 352 | ||
353 | BT_DBG("len %d room %d", len, room); | 353 | BT_DBG("len %d room %d", len, room); |
354 | 354 | ||
@@ -374,11 +374,11 @@ static inline int ll_check_data_len(struct ll_struct *ll, int len) | |||
374 | static int ll_recv(struct hci_uart *hu, void *data, int count) | 374 | static int ll_recv(struct hci_uart *hu, void *data, int count) |
375 | { | 375 | { |
376 | struct ll_struct *ll = hu->priv; | 376 | struct ll_struct *ll = hu->priv; |
377 | register char *ptr; | 377 | char *ptr; |
378 | struct hci_event_hdr *eh; | 378 | struct hci_event_hdr *eh; |
379 | struct hci_acl_hdr *ah; | 379 | struct hci_acl_hdr *ah; |
380 | struct hci_sco_hdr *sh; | 380 | struct hci_sco_hdr *sh; |
381 | register int len, type, dlen; | 381 | int len, type, dlen; |
382 | 382 | ||
383 | BT_DBG("hu %p count %d rx_state %ld rx_count %ld", hu, count, ll->rx_state, ll->rx_count); | 383 | BT_DBG("hu %p count %d rx_state %ld rx_count %ld", hu, count, ll->rx_state, ll->rx_count); |
384 | 384 | ||