Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Gustavo Padovan and committed by
Johan Hedberg
fc5fef61 6039aa73

+19 -19
+5 -5
drivers/bluetooth/bluecard_cs.c
··· 231 231 } 232 232 233 233 do { 234 - register unsigned int iobase = info->p_dev->resource[0]->start; 235 - register unsigned int offset; 236 - register unsigned char command; 237 - register unsigned long ready_bit; 234 + unsigned int iobase = info->p_dev->resource[0]->start; 235 + unsigned int offset; 236 + unsigned char command; 237 + unsigned long ready_bit; 238 238 register struct sk_buff *skb; 239 - register int len; 239 + int len; 240 240 241 241 clear_bit(XMIT_WAKEUP, &(info->tx_state)); 242 242
+2 -2
drivers/bluetooth/bt3c_cs.c
··· 186 186 return; 187 187 188 188 do { 189 - register unsigned int iobase = info->p_dev->resource[0]->start; 189 + unsigned int iobase = info->p_dev->resource[0]->start; 190 190 register struct sk_buff *skb; 191 - register int len; 191 + int len; 192 192 193 193 if (!pcmcia_dev_present(info->p_dev)) 194 194 break;
+2 -2
drivers/bluetooth/btuart_cs.c
··· 140 140 } 141 141 142 142 do { 143 - register unsigned int iobase = info->p_dev->resource[0]->start; 143 + unsigned int iobase = info->p_dev->resource[0]->start; 144 144 register struct sk_buff *skb; 145 - register int len; 145 + int len; 146 146 147 147 clear_bit(XMIT_WAKEUP, &(info->tx_state)); 148 148
+2 -2
drivers/bluetooth/dtl1_cs.c
··· 144 144 } 145 145 146 146 do { 147 - register unsigned int iobase = info->p_dev->resource[0]->start; 147 + unsigned int iobase = info->p_dev->resource[0]->start; 148 148 register struct sk_buff *skb; 149 - register int len; 149 + int len; 150 150 151 151 clear_bit(XMIT_WAKEUP, &(info->tx_state)); 152 152
+1 -1
drivers/bluetooth/hci_bcsp.c
··· 552 552 static int bcsp_recv(struct hci_uart *hu, void *data, int count) 553 553 { 554 554 struct bcsp_struct *bcsp = hu->priv; 555 - register unsigned char *ptr; 555 + unsigned char *ptr; 556 556 557 557 BT_DBG("hu %p count %d rx_state %d rx_count %ld", 558 558 hu, count, bcsp->rx_state, bcsp->rx_count);
+1 -1
drivers/bluetooth/hci_h4.c
··· 126 126 127 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 131 BT_DBG("len %d room %d", len, room); 132 132
+3 -3
drivers/bluetooth/hci_ll.c
··· 348 348 349 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 353 BT_DBG("len %d room %d", len, room); 354 354 ··· 374 374 static int ll_recv(struct hci_uart *hu, void *data, int count) 375 375 { 376 376 struct ll_struct *ll = hu->priv; 377 - register char *ptr; 377 + char *ptr; 378 378 struct hci_event_hdr *eh; 379 379 struct hci_acl_hdr *ah; 380 380 struct hci_sco_hdr *sh; 381 - register int len, type, dlen; 381 + int len, type, dlen; 382 382 383 383 BT_DBG("hu %p count %d rx_state %ld rx_count %ld", hu, count, ll->rx_state, ll->rx_count); 384 384
+1 -1
net/bluetooth/hci_conn.c
··· 799 799 800 800 int hci_get_conn_list(void __user *arg) 801 801 { 802 - register struct hci_conn *c; 802 + struct hci_conn *c; 803 803 struct hci_conn_list_req req, *cl; 804 804 struct hci_conn_info *ci; 805 805 struct hci_dev *hdev;
+1 -1
net/bluetooth/hci_sock.c
··· 118 118 continue; 119 119 120 120 if (bt_cb(skb)->pkt_type == HCI_EVENT_PKT) { 121 - register int evt = (*(__u8 *)skb->data & HCI_FLT_EVENT_BITS); 121 + int evt = (*(__u8 *)skb->data & HCI_FLT_EVENT_BITS); 122 122 123 123 if (!hci_test_bit(evt, &flt->event_mask)) 124 124 continue;
+1 -1
net/bluetooth/sco.c
··· 908 908 /* ----- SCO interface with lower layer (HCI) ----- */ 909 909 int sco_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr) 910 910 { 911 - register struct sock *sk; 911 + struct sock *sk; 912 912 struct hlist_node *node; 913 913 int lm = 0; 914 914