Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'nfc-constify-pointed-data-missed-part'
Krzysztof Kozlowski says:
====================
nfc: constify pointed data - missed part
This was previously sent [1] but got lost. It was a prerequisite to part two of NFC const [2].
Changes since v2:
1. Drop patch previously 7/8 which cases new warnings "warning: Using
plain integer as NULL pointer".
Changes since v1:
1. Add patch 1/8 fixing up nfcmrvl_spi_parse_dt()
[1] https://lore.kernel.org/lkml/20210726145224.146006-1-krzysztof.kozlowski@canonical.com/
[2] https://lore.kernel.org/linux-nfc/20210729104022.47761-1-krzysztof.kozlowski@canonical.com/T/#m199fbdde180fa005a10addf28479fcbdc6263eab
====================
Link: https://lore.kernel.org/r/20210730144202.255890-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+206
-183
+1
-1
drivers/nfc/nfcmrvl/spi.c
+1
-1
drivers/nfc/nfcmrvl/spi.c
+2
-2
drivers/nfc/pn544/pn544.c
+2
-2
drivers/nfc/pn544/pn544.c
···
809
809
#define PN544_SE_MODE_ON 0x01
810
810
static int pn544_hci_enable_se(struct nfc_hci_dev *hdev, u32 se_idx)
811
811
{
812
-
struct nfc_se *se;
812
+
const struct nfc_se *se;
813
813
u8 enable = PN544_SE_MODE_ON;
814
814
static struct uicc_gatelist {
815
815
u8 head;
···
864
864
865
865
static int pn544_hci_disable_se(struct nfc_hci_dev *hdev, u32 se_idx)
866
866
{
867
-
struct nfc_se *se;
867
+
const struct nfc_se *se;
868
868
u8 disable = PN544_SE_MODE_OFF;
869
869
870
870
se = nfc_find_se(hdev->ndev, se_idx);
+8
-6
include/net/nfc/nci_core.h
+8
-6
include/net/nfc/nci_core.h
···
278
278
void (*req)(struct nci_dev *ndev,
279
279
unsigned long opt),
280
280
unsigned long opt, __u32 timeout);
281
-
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload);
282
-
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload);
281
+
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len,
282
+
const __u8 *payload);
283
+
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len,
284
+
const __u8 *payload);
283
285
int nci_core_reset(struct nci_dev *ndev);
284
286
int nci_core_init(struct nci_dev *ndev);
285
287
286
288
int nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb);
287
289
int nci_send_frame(struct nci_dev *ndev, struct sk_buff *skb);
288
-
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val);
290
+
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, const __u8 *val);
289
291
290
292
int nci_nfcee_discover(struct nci_dev *ndev, u8 action);
291
293
int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode);
292
294
int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,
293
295
u8 number_destination_params,
294
296
size_t params_len,
295
-
struct core_conn_create_dest_spec_params *params);
297
+
const struct core_conn_create_dest_spec_params *params);
296
298
int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id);
297
-
int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len,
299
+
int nci_nfcc_loopback(struct nci_dev *ndev, const void *data, size_t data_len,
298
300
struct sk_buff **resp);
299
301
300
302
struct nci_hci_dev *nci_hci_allocate(struct nci_dev *ndev);
···
380
378
struct nci_conn_info *nci_get_conn_info_by_conn_id(struct nci_dev *ndev,
381
379
int conn_id);
382
380
int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
383
-
struct dest_spec_params *params);
381
+
const struct dest_spec_params *params);
384
382
385
383
/* ----- NCI status code ----- */
386
384
int nci_to_errno(__u8 code);
+2
-2
include/net/nfc/nfc.h
+2
-2
include/net/nfc/nfc.h
···
266
266
struct sk_buff *nfc_alloc_recv_skb(unsigned int size, gfp_t gfp);
267
267
268
268
int nfc_set_remote_general_bytes(struct nfc_dev *dev,
269
-
u8 *gt, u8 gt_len);
269
+
const u8 *gt, u8 gt_len);
270
270
u8 *nfc_get_local_general_bytes(struct nfc_dev *dev, size_t *gb_len);
271
271
272
272
int nfc_fw_download_done(struct nfc_dev *dev, const char *firmware_name,
···
280
280
u8 comm_mode, u8 rf_mode);
281
281
282
282
int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
283
-
u8 *gb, size_t gb_len);
283
+
const u8 *gb, size_t gb_len);
284
284
int nfc_tm_deactivated(struct nfc_dev *dev);
285
285
int nfc_tm_data_received(struct nfc_dev *dev, struct sk_buff *skb);
286
286
+1
-1
net/nfc/af_nfc.c
+1
-1
net/nfc/af_nfc.c
+3
-3
net/nfc/core.c
+3
-3
net/nfc/core.c
···
636
636
return rc;
637
637
}
638
638
639
-
int nfc_set_remote_general_bytes(struct nfc_dev *dev, u8 *gb, u8 gb_len)
639
+
int nfc_set_remote_general_bytes(struct nfc_dev *dev, const u8 *gb, u8 gb_len)
640
640
{
641
641
pr_debug("dev_name=%s gb_len=%d\n", dev_name(&dev->dev), gb_len);
642
642
···
665
665
EXPORT_SYMBOL(nfc_tm_data_received);
666
666
667
667
int nfc_tm_activated(struct nfc_dev *dev, u32 protocol, u8 comm_mode,
668
-
u8 *gb, size_t gb_len)
668
+
const u8 *gb, size_t gb_len)
669
669
{
670
670
int rc;
671
671
···
824
824
*/
825
825
int nfc_target_lost(struct nfc_dev *dev, u32 target_idx)
826
826
{
827
-
struct nfc_target *tg;
827
+
const struct nfc_target *tg;
828
828
int i;
829
829
830
830
pr_debug("dev_name %s n_target %d\n", dev_name(&dev->dev), target_idx);
+4
-4
net/nfc/hci/core.c
+4
-4
net/nfc/hci/core.c
···
128
128
struct nfc_hci_dev *hdev = container_of(work, struct nfc_hci_dev,
129
129
msg_rx_work);
130
130
struct sk_buff *skb;
131
-
struct hcp_message *message;
131
+
const struct hcp_message *message;
132
132
u8 pipe;
133
133
u8 type;
134
134
u8 instruction;
···
182
182
struct sk_buff *skb)
183
183
{
184
184
u8 status = NFC_HCI_ANY_OK;
185
-
struct hci_create_pipe_resp *create_info;
186
-
struct hci_delete_pipe_noti *delete_info;
187
-
struct hci_all_pipe_cleared_noti *cleared_info;
185
+
const struct hci_create_pipe_resp *create_info;
186
+
const struct hci_delete_pipe_noti *delete_info;
187
+
const struct hci_all_pipe_cleared_noti *cleared_info;
188
188
u8 gate;
189
189
190
190
pr_debug("from pipe %x cmd %x\n", pipe, cmd);
+1
-1
net/nfc/hci/llc.c
+1
-1
net/nfc/hci/llc.c
+5
-5
net/nfc/hci/llc_shdlc.c
+5
-5
net/nfc/hci/llc_shdlc.c
···
123
123
return ((y >= x) || (y < z)) ? true : false;
124
124
}
125
125
126
-
static struct sk_buff *llc_shdlc_alloc_skb(struct llc_shdlc *shdlc,
126
+
static struct sk_buff *llc_shdlc_alloc_skb(const struct llc_shdlc *shdlc,
127
127
int payload_len)
128
128
{
129
129
struct sk_buff *skb;
···
137
137
}
138
138
139
139
/* immediately sends an S frame. */
140
-
static int llc_shdlc_send_s_frame(struct llc_shdlc *shdlc,
140
+
static int llc_shdlc_send_s_frame(const struct llc_shdlc *shdlc,
141
141
enum sframe_type sframe_type, int nr)
142
142
{
143
143
int r;
···
159
159
}
160
160
161
161
/* immediately sends an U frame. skb may contain optional payload */
162
-
static int llc_shdlc_send_u_frame(struct llc_shdlc *shdlc,
162
+
static int llc_shdlc_send_u_frame(const struct llc_shdlc *shdlc,
163
163
struct sk_buff *skb,
164
164
enum uframe_modifier uframe_modifier)
165
165
{
···
361
361
wake_up(shdlc->connect_wq);
362
362
}
363
363
364
-
static int llc_shdlc_connect_initiate(struct llc_shdlc *shdlc)
364
+
static int llc_shdlc_connect_initiate(const struct llc_shdlc *shdlc)
365
365
{
366
366
struct sk_buff *skb;
367
367
···
377
377
return llc_shdlc_send_u_frame(shdlc, skb, U_FRAME_RSET);
378
378
}
379
379
380
-
static int llc_shdlc_connect_send_ua(struct llc_shdlc *shdlc)
380
+
static int llc_shdlc_connect_send_ua(const struct llc_shdlc *shdlc)
381
381
{
382
382
struct sk_buff *skb;
383
383
+4
-4
net/nfc/llcp.h
+4
-4
net/nfc/llcp.h
···
221
221
222
222
/* TLV API */
223
223
int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
224
-
u8 *tlv_array, u16 tlv_array_len);
224
+
const u8 *tlv_array, u16 tlv_array_len);
225
225
int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
226
-
u8 *tlv_array, u16 tlv_array_len);
226
+
const u8 *tlv_array, u16 tlv_array_len);
227
227
228
228
/* Commands API */
229
229
void nfc_llcp_recv(void *data, struct sk_buff *skb, int err);
230
-
u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length);
230
+
u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length);
231
231
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdres_tlv(u8 tid, u8 sap);
232
-
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,
232
+
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,
233
233
size_t uri_len);
234
234
void nfc_llcp_free_sdp_tlv(struct nfc_llcp_sdp_tlv *sdp);
235
235
void nfc_llcp_free_sdp_tlv_list(struct hlist_head *sdp_head);
+25
-21
net/nfc/llcp_commands.c
+25
-21
net/nfc/llcp_commands.c
···
15
15
#include "nfc.h"
16
16
#include "llcp.h"
17
17
18
-
static u8 llcp_tlv_length[LLCP_TLV_MAX] = {
18
+
static const u8 llcp_tlv_length[LLCP_TLV_MAX] = {
19
19
0,
20
20
1, /* VERSION */
21
21
2, /* MIUX */
···
29
29
30
30
};
31
31
32
-
static u8 llcp_tlv8(u8 *tlv, u8 type)
32
+
static u8 llcp_tlv8(const u8 *tlv, u8 type)
33
33
{
34
34
if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
35
35
return 0;
···
37
37
return tlv[2];
38
38
}
39
39
40
-
static u16 llcp_tlv16(u8 *tlv, u8 type)
40
+
static u16 llcp_tlv16(const u8 *tlv, u8 type)
41
41
{
42
42
if (tlv[0] != type || tlv[1] != llcp_tlv_length[tlv[0]])
43
43
return 0;
···
46
46
}
47
47
48
48
49
-
static u8 llcp_tlv_version(u8 *tlv)
49
+
static u8 llcp_tlv_version(const u8 *tlv)
50
50
{
51
51
return llcp_tlv8(tlv, LLCP_TLV_VERSION);
52
52
}
53
53
54
-
static u16 llcp_tlv_miux(u8 *tlv)
54
+
static u16 llcp_tlv_miux(const u8 *tlv)
55
55
{
56
56
return llcp_tlv16(tlv, LLCP_TLV_MIUX) & 0x7ff;
57
57
}
58
58
59
-
static u16 llcp_tlv_wks(u8 *tlv)
59
+
static u16 llcp_tlv_wks(const u8 *tlv)
60
60
{
61
61
return llcp_tlv16(tlv, LLCP_TLV_WKS);
62
62
}
63
63
64
-
static u16 llcp_tlv_lto(u8 *tlv)
64
+
static u16 llcp_tlv_lto(const u8 *tlv)
65
65
{
66
66
return llcp_tlv8(tlv, LLCP_TLV_LTO);
67
67
}
68
68
69
-
static u8 llcp_tlv_opt(u8 *tlv)
69
+
static u8 llcp_tlv_opt(const u8 *tlv)
70
70
{
71
71
return llcp_tlv8(tlv, LLCP_TLV_OPT);
72
72
}
73
73
74
-
static u8 llcp_tlv_rw(u8 *tlv)
74
+
static u8 llcp_tlv_rw(const u8 *tlv)
75
75
{
76
76
return llcp_tlv8(tlv, LLCP_TLV_RW) & 0xf;
77
77
}
78
78
79
-
u8 *nfc_llcp_build_tlv(u8 type, u8 *value, u8 value_length, u8 *tlv_length)
79
+
u8 *nfc_llcp_build_tlv(u8 type, const u8 *value, u8 value_length, u8 *tlv_length)
80
80
{
81
81
u8 *tlv, length;
82
82
···
130
130
return sdres;
131
131
}
132
132
133
-
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, char *uri,
133
+
struct nfc_llcp_sdp_tlv *nfc_llcp_build_sdreq_tlv(u8 tid, const char *uri,
134
134
size_t uri_len)
135
135
{
136
136
struct nfc_llcp_sdp_tlv *sdreq;
···
190
190
}
191
191
192
192
int nfc_llcp_parse_gb_tlv(struct nfc_llcp_local *local,
193
-
u8 *tlv_array, u16 tlv_array_len)
193
+
const u8 *tlv_array, u16 tlv_array_len)
194
194
{
195
-
u8 *tlv = tlv_array, type, length, offset = 0;
195
+
const u8 *tlv = tlv_array;
196
+
u8 type, length, offset = 0;
196
197
197
198
pr_debug("TLV array length %d\n", tlv_array_len);
198
199
···
240
239
}
241
240
242
241
int nfc_llcp_parse_connection_tlv(struct nfc_llcp_sock *sock,
243
-
u8 *tlv_array, u16 tlv_array_len)
242
+
const u8 *tlv_array, u16 tlv_array_len)
244
243
{
245
-
u8 *tlv = tlv_array, type, length, offset = 0;
244
+
const u8 *tlv = tlv_array;
245
+
u8 type, length, offset = 0;
246
246
247
247
pr_debug("TLV array length %d\n", tlv_array_len);
248
248
···
297
295
return pdu;
298
296
}
299
297
300
-
static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, u8 *tlv,
298
+
static struct sk_buff *llcp_add_tlv(struct sk_buff *pdu, const u8 *tlv,
301
299
u8 tlv_length)
302
300
{
303
301
/* XXX Add an skb length check */
···
391
389
{
392
390
struct nfc_llcp_local *local;
393
391
struct sk_buff *skb;
394
-
u8 *service_name_tlv = NULL, service_name_tlv_length;
395
-
u8 *miux_tlv = NULL, miux_tlv_length;
396
-
u8 *rw_tlv = NULL, rw_tlv_length, rw;
392
+
const u8 *service_name_tlv = NULL;
393
+
const u8 *miux_tlv = NULL;
394
+
const u8 *rw_tlv = NULL;
395
+
u8 service_name_tlv_length, miux_tlv_length, rw_tlv_length, rw;
397
396
int err;
398
397
u16 size = 0;
399
398
__be16 miux;
···
468
465
{
469
466
struct nfc_llcp_local *local;
470
467
struct sk_buff *skb;
471
-
u8 *miux_tlv = NULL, miux_tlv_length;
472
-
u8 *rw_tlv = NULL, rw_tlv_length, rw;
468
+
const u8 *miux_tlv = NULL;
469
+
const u8 *rw_tlv = NULL;
470
+
u8 miux_tlv_length, rw_tlv_length, rw;
473
471
int err;
474
472
u16 size = 0;
475
473
__be16 miux;
+24
-20
net/nfc/llcp_core.c
+24
-20
net/nfc/llcp_core.c
···
301
301
"urn:nfc:sn:snep",
302
302
};
303
303
304
-
static int nfc_llcp_wks_sap(char *service_name, size_t service_name_len)
304
+
static int nfc_llcp_wks_sap(const char *service_name, size_t service_name_len)
305
305
{
306
306
int sap, num_wks;
307
307
···
325
325
326
326
static
327
327
struct nfc_llcp_sock *nfc_llcp_sock_from_sn(struct nfc_llcp_local *local,
328
-
u8 *sn, size_t sn_len)
328
+
const u8 *sn, size_t sn_len)
329
329
{
330
330
struct sock *sk;
331
331
struct nfc_llcp_sock *llcp_sock, *tmp_sock;
···
522
522
{
523
523
u8 *gb_cur, version, version_length;
524
524
u8 lto_length, wks_length, miux_length;
525
-
u8 *version_tlv = NULL, *lto_tlv = NULL,
525
+
const u8 *version_tlv = NULL, *lto_tlv = NULL,
526
526
*wks_tlv = NULL, *miux_tlv = NULL;
527
527
__be16 wks = cpu_to_be16(local->local_wks);
528
528
u8 gb_len = 0;
···
612
612
return local->gb;
613
613
}
614
614
615
-
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len)
615
+
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len)
616
616
{
617
617
struct nfc_llcp_local *local;
618
618
···
639
639
local->remote_gb_len - 3);
640
640
}
641
641
642
-
static u8 nfc_llcp_dsap(struct sk_buff *pdu)
642
+
static u8 nfc_llcp_dsap(const struct sk_buff *pdu)
643
643
{
644
644
return (pdu->data[0] & 0xfc) >> 2;
645
645
}
646
646
647
-
static u8 nfc_llcp_ptype(struct sk_buff *pdu)
647
+
static u8 nfc_llcp_ptype(const struct sk_buff *pdu)
648
648
{
649
649
return ((pdu->data[0] & 0x03) << 2) | ((pdu->data[1] & 0xc0) >> 6);
650
650
}
651
651
652
-
static u8 nfc_llcp_ssap(struct sk_buff *pdu)
652
+
static u8 nfc_llcp_ssap(const struct sk_buff *pdu)
653
653
{
654
654
return pdu->data[1] & 0x3f;
655
655
}
656
656
657
-
static u8 nfc_llcp_ns(struct sk_buff *pdu)
657
+
static u8 nfc_llcp_ns(const struct sk_buff *pdu)
658
658
{
659
659
return pdu->data[2] >> 4;
660
660
}
661
661
662
-
static u8 nfc_llcp_nr(struct sk_buff *pdu)
662
+
static u8 nfc_llcp_nr(const struct sk_buff *pdu)
663
663
{
664
664
return pdu->data[2] & 0xf;
665
665
}
···
801
801
}
802
802
803
803
static struct nfc_llcp_sock *nfc_llcp_sock_get_sn(struct nfc_llcp_local *local,
804
-
u8 *sn, size_t sn_len)
804
+
const u8 *sn, size_t sn_len)
805
805
{
806
806
struct nfc_llcp_sock *llcp_sock;
807
807
···
815
815
return llcp_sock;
816
816
}
817
817
818
-
static u8 *nfc_llcp_connect_sn(struct sk_buff *skb, size_t *sn_len)
818
+
static const u8 *nfc_llcp_connect_sn(const struct sk_buff *skb, size_t *sn_len)
819
819
{
820
-
u8 *tlv = &skb->data[2], type, length;
820
+
u8 type, length;
821
+
const u8 *tlv = &skb->data[2];
821
822
size_t tlv_array_len = skb->len - LLCP_HEADER_SIZE, offset = 0;
822
823
823
824
while (offset < tlv_array_len) {
···
876
875
}
877
876
878
877
static void nfc_llcp_recv_connect(struct nfc_llcp_local *local,
879
-
struct sk_buff *skb)
878
+
const struct sk_buff *skb)
880
879
{
881
880
struct sock *new_sk, *parent;
882
881
struct nfc_llcp_sock *sock, *new_sock;
···
894
893
goto fail;
895
894
}
896
895
} else {
897
-
u8 *sn;
896
+
const u8 *sn;
898
897
size_t sn_len;
899
898
900
899
sn = nfc_llcp_connect_sn(skb, &sn_len);
···
1113
1112
}
1114
1113
1115
1114
static void nfc_llcp_recv_disc(struct nfc_llcp_local *local,
1116
-
struct sk_buff *skb)
1115
+
const struct sk_buff *skb)
1117
1116
{
1118
1117
struct nfc_llcp_sock *llcp_sock;
1119
1118
struct sock *sk;
···
1156
1155
nfc_llcp_sock_put(llcp_sock);
1157
1156
}
1158
1157
1159
-
static void nfc_llcp_recv_cc(struct nfc_llcp_local *local, struct sk_buff *skb)
1158
+
static void nfc_llcp_recv_cc(struct nfc_llcp_local *local,
1159
+
const struct sk_buff *skb)
1160
1160
{
1161
1161
struct nfc_llcp_sock *llcp_sock;
1162
1162
struct sock *sk;
···
1190
1188
nfc_llcp_sock_put(llcp_sock);
1191
1189
}
1192
1190
1193
-
static void nfc_llcp_recv_dm(struct nfc_llcp_local *local, struct sk_buff *skb)
1191
+
static void nfc_llcp_recv_dm(struct nfc_llcp_local *local,
1192
+
const struct sk_buff *skb)
1194
1193
{
1195
1194
struct nfc_llcp_sock *llcp_sock;
1196
1195
struct sock *sk;
···
1229
1226
}
1230
1227
1231
1228
static void nfc_llcp_recv_snl(struct nfc_llcp_local *local,
1232
-
struct sk_buff *skb)
1229
+
const struct sk_buff *skb)
1233
1230
{
1234
1231
struct nfc_llcp_sock *llcp_sock;
1235
-
u8 dsap, ssap, *tlv, type, length, tid, sap;
1232
+
u8 dsap, ssap, type, length, tid, sap;
1233
+
const u8 *tlv;
1236
1234
u16 tlv_len, offset;
1237
-
char *service_name;
1235
+
const char *service_name;
1238
1236
size_t service_name_len;
1239
1237
struct nfc_llcp_sdp_tlv *sdp;
1240
1238
HLIST_HEAD(llc_sdres_list);
+25
-23
net/nfc/nci/core.c
+25
-23
net/nfc/nci/core.c
···
53
53
}
54
54
55
55
int nci_get_conn_info_by_dest_type_params(struct nci_dev *ndev, u8 dest_type,
56
-
struct dest_spec_params *params)
56
+
const struct dest_spec_params *params)
57
57
{
58
-
struct nci_conn_info *conn_info;
58
+
const struct nci_conn_info *conn_info;
59
59
60
60
list_for_each_entry(conn_info, &ndev->conn_info_list, list) {
61
61
if (conn_info->dest_type == dest_type) {
···
210
210
}
211
211
212
212
struct nci_set_config_param {
213
-
__u8 id;
214
-
size_t len;
215
-
__u8 *val;
213
+
__u8 id;
214
+
size_t len;
215
+
const __u8 *val;
216
216
};
217
217
218
218
static void nci_set_config_req(struct nci_dev *ndev, unsigned long opt)
219
219
{
220
-
struct nci_set_config_param *param = (struct nci_set_config_param *)opt;
220
+
const struct nci_set_config_param *param =
221
+
(struct nci_set_config_param *)opt;
221
222
struct nci_core_set_config_cmd cmd;
222
223
223
224
BUG_ON(param->len > NCI_MAX_PARAM_LEN);
···
238
237
239
238
static void nci_rf_discover_req(struct nci_dev *ndev, unsigned long opt)
240
239
{
241
-
struct nci_rf_discover_param *param =
240
+
const struct nci_rf_discover_param *param =
242
241
(struct nci_rf_discover_param *)opt;
243
242
struct nci_rf_disc_cmd cmd;
244
243
···
304
303
305
304
static void nci_rf_discover_select_req(struct nci_dev *ndev, unsigned long opt)
306
305
{
307
-
struct nci_rf_discover_select_param *param =
306
+
const struct nci_rf_discover_select_param *param =
308
307
(struct nci_rf_discover_select_param *)opt;
309
308
struct nci_rf_discover_select_cmd cmd;
310
309
···
342
341
struct nci_cmd_param {
343
342
__u16 opcode;
344
343
size_t len;
345
-
__u8 *payload;
344
+
const __u8 *payload;
346
345
};
347
346
348
347
static void nci_generic_req(struct nci_dev *ndev, unsigned long opt)
349
348
{
350
-
struct nci_cmd_param *param =
349
+
const struct nci_cmd_param *param =
351
350
(struct nci_cmd_param *)opt;
352
351
353
352
nci_send_cmd(ndev, param->opcode, param->len, param->payload);
354
353
}
355
354
356
-
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, __u8 *payload)
355
+
int nci_prop_cmd(struct nci_dev *ndev, __u8 oid, size_t len, const __u8 *payload)
357
356
{
358
357
struct nci_cmd_param param;
359
358
···
366
365
}
367
366
EXPORT_SYMBOL(nci_prop_cmd);
368
367
369
-
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len, __u8 *payload)
368
+
int nci_core_cmd(struct nci_dev *ndev, __u16 opcode, size_t len,
369
+
const __u8 *payload)
370
370
{
371
371
struct nci_cmd_param param;
372
372
···
401
399
402
400
static void nci_send_data_req(struct nci_dev *ndev, unsigned long opt)
403
401
{
404
-
struct nci_loopback_data *data = (struct nci_loopback_data *)opt;
402
+
const struct nci_loopback_data *data = (struct nci_loopback_data *)opt;
405
403
406
404
nci_send_data(ndev, data->conn_id, data->data);
407
405
}
···
409
407
static void nci_nfcc_loopback_cb(void *context, struct sk_buff *skb, int err)
410
408
{
411
409
struct nci_dev *ndev = (struct nci_dev *)context;
412
-
struct nci_conn_info *conn_info;
410
+
struct nci_conn_info *conn_info;
413
411
414
412
conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
415
413
if (!conn_info) {
···
422
420
nci_req_complete(ndev, NCI_STATUS_OK);
423
421
}
424
422
425
-
int nci_nfcc_loopback(struct nci_dev *ndev, void *data, size_t data_len,
423
+
int nci_nfcc_loopback(struct nci_dev *ndev, const void *data, size_t data_len,
426
424
struct sk_buff **resp)
427
425
{
428
426
int r;
···
626
624
return nci_close_device(ndev);
627
625
}
628
626
629
-
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, __u8 *val)
627
+
int nci_set_config(struct nci_dev *ndev, __u8 id, size_t len, const __u8 *val)
630
628
{
631
629
struct nci_set_config_param param;
632
630
···
661
659
662
660
static void nci_nfcee_mode_set_req(struct nci_dev *ndev, unsigned long opt)
663
661
{
664
-
struct nci_nfcee_mode_set_cmd *cmd =
662
+
const struct nci_nfcee_mode_set_cmd *cmd =
665
663
(struct nci_nfcee_mode_set_cmd *)opt;
666
664
667
665
nci_send_cmd(ndev, NCI_OP_NFCEE_MODE_SET_CMD,
···
683
681
684
682
static void nci_core_conn_create_req(struct nci_dev *ndev, unsigned long opt)
685
683
{
686
-
struct core_conn_create_data *data =
684
+
const struct core_conn_create_data *data =
687
685
(struct core_conn_create_data *)opt;
688
686
689
687
nci_send_cmd(ndev, NCI_OP_CORE_CONN_CREATE_CMD, data->length, data->cmd);
···
692
690
int nci_core_conn_create(struct nci_dev *ndev, u8 destination_type,
693
691
u8 number_destination_params,
694
692
size_t params_len,
695
-
struct core_conn_create_dest_spec_params *params)
693
+
const struct core_conn_create_dest_spec_params *params)
696
694
{
697
695
int r;
698
696
struct nci_core_conn_create_cmd *cmd;
···
865
863
{
866
864
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
867
865
struct nci_rf_discover_select_param param;
868
-
struct nfc_target *nci_target = NULL;
866
+
const struct nfc_target *nci_target = NULL;
869
867
int i;
870
868
int rc = 0;
871
869
···
1006
1004
{
1007
1005
struct nci_dev *ndev = nfc_get_drvdata(nfc_dev);
1008
1006
int rc;
1009
-
struct nci_conn_info *conn_info;
1007
+
struct nci_conn_info *conn_info;
1010
1008
1011
1009
conn_info = ndev->rf_conn_info;
1012
1010
if (!conn_info)
···
1271
1269
*/
1272
1270
void nci_unregister_device(struct nci_dev *ndev)
1273
1271
{
1274
-
struct nci_conn_info *conn_info, *n;
1272
+
struct nci_conn_info *conn_info, *n;
1275
1273
1276
1274
nci_close_device(ndev);
1277
1275
···
1443
1441
static void nci_tx_work(struct work_struct *work)
1444
1442
{
1445
1443
struct nci_dev *ndev = container_of(work, struct nci_dev, tx_work);
1446
-
struct nci_conn_info *conn_info;
1444
+
struct nci_conn_info *conn_info;
1447
1445
struct sk_buff *skb;
1448
1446
1449
1447
conn_info = nci_get_conn_info_by_conn_id(ndev, ndev->cur_conn_id);
+6
-6
net/nfc/nci/data.c
+6
-6
net/nfc/nci/data.c
···
26
26
void nci_data_exchange_complete(struct nci_dev *ndev, struct sk_buff *skb,
27
27
__u8 conn_id, int err)
28
28
{
29
-
struct nci_conn_info *conn_info;
29
+
const struct nci_conn_info *conn_info;
30
30
data_exchange_cb_t cb;
31
31
void *cb_context;
32
32
···
80
80
81
81
int nci_conn_max_data_pkt_payload_size(struct nci_dev *ndev, __u8 conn_id)
82
82
{
83
-
struct nci_conn_info *conn_info;
83
+
const struct nci_conn_info *conn_info;
84
84
85
85
conn_info = nci_get_conn_info_by_conn_id(ndev, conn_id);
86
86
if (!conn_info)
···
93
93
static int nci_queue_tx_data_frags(struct nci_dev *ndev,
94
94
__u8 conn_id,
95
95
struct sk_buff *skb) {
96
-
struct nci_conn_info *conn_info;
96
+
const struct nci_conn_info *conn_info;
97
97
int total_len = skb->len;
98
-
unsigned char *data = skb->data;
98
+
const unsigned char *data = skb->data;
99
99
unsigned long flags;
100
100
struct sk_buff_head frags_q;
101
101
struct sk_buff *skb_frag;
···
166
166
/* Send NCI data */
167
167
int nci_send_data(struct nci_dev *ndev, __u8 conn_id, struct sk_buff *skb)
168
168
{
169
-
struct nci_conn_info *conn_info;
169
+
const struct nci_conn_info *conn_info;
170
170
int rc = 0;
171
171
172
172
pr_debug("conn_id 0x%x, plen %d\n", conn_id, skb->len);
···
269
269
__u8 pbf = nci_pbf(skb->data);
270
270
__u8 status = 0;
271
271
__u8 conn_id = nci_conn_id(skb->data);
272
-
struct nci_conn_info *conn_info;
272
+
const struct nci_conn_info *conn_info;
273
273
274
274
pr_debug("len %d\n", skb->len);
275
275
+19
-19
net/nfc/nci/hci.c
+19
-19
net/nfc/nci/hci.c
···
16
16
#include <linux/nfc.h>
17
17
18
18
struct nci_data {
19
-
u8 conn_id;
20
-
u8 pipe;
21
-
u8 cmd;
22
-
const u8 *data;
23
-
u32 data_len;
19
+
u8 conn_id;
20
+
u8 pipe;
21
+
u8 cmd;
22
+
const u8 *data;
23
+
u32 data_len;
24
24
} __packed;
25
25
26
26
struct nci_hci_create_pipe_params {
···
142
142
const u8 data_type, const u8 *data,
143
143
size_t data_len)
144
144
{
145
-
struct nci_conn_info *conn_info;
145
+
const struct nci_conn_info *conn_info;
146
146
struct sk_buff *skb;
147
147
int len, i, r;
148
148
u8 cb = pipe;
···
197
197
198
198
static void nci_hci_send_data_req(struct nci_dev *ndev, unsigned long opt)
199
199
{
200
-
struct nci_data *data = (struct nci_data *)opt;
200
+
const struct nci_data *data = (struct nci_data *)opt;
201
201
202
202
nci_hci_send_data(ndev, data->pipe, data->cmd,
203
203
data->data, data->data_len);
···
221
221
const u8 *param, size_t param_len,
222
222
struct sk_buff **skb)
223
223
{
224
-
struct nci_hcp_message *message;
225
-
struct nci_conn_info *conn_info;
224
+
const struct nci_hcp_message *message;
225
+
const struct nci_conn_info *conn_info;
226
226
struct nci_data data;
227
227
int r;
228
228
u8 pipe = ndev->hci_dev->gate2pipe[gate];
···
363
363
static void nci_hci_resp_received(struct nci_dev *ndev, u8 pipe,
364
364
struct sk_buff *skb)
365
365
{
366
-
struct nci_conn_info *conn_info;
366
+
struct nci_conn_info *conn_info;
367
367
368
368
conn_info = ndev->hci_dev->conn_info;
369
369
if (!conn_info)
···
406
406
struct nci_hci_dev *hdev =
407
407
container_of(work, struct nci_hci_dev, msg_rx_work);
408
408
struct sk_buff *skb;
409
-
struct nci_hcp_message *message;
409
+
const struct nci_hcp_message *message;
410
410
u8 pipe, type, instruction;
411
411
412
412
while ((skb = skb_dequeue(&hdev->msg_rx_queue)) != NULL) {
···
498
498
int nci_hci_open_pipe(struct nci_dev *ndev, u8 pipe)
499
499
{
500
500
struct nci_data data;
501
-
struct nci_conn_info *conn_info;
501
+
const struct nci_conn_info *conn_info;
502
502
503
503
conn_info = ndev->hci_dev->conn_info;
504
504
if (!conn_info)
···
523
523
u8 pipe;
524
524
struct sk_buff *skb;
525
525
struct nci_hci_create_pipe_params params;
526
-
struct nci_hci_create_pipe_resp *resp;
526
+
const struct nci_hci_create_pipe_resp *resp;
527
527
528
528
pr_debug("gate=%d\n", dest_gate);
529
529
···
557
557
int nci_hci_set_param(struct nci_dev *ndev, u8 gate, u8 idx,
558
558
const u8 *param, size_t param_len)
559
559
{
560
-
struct nci_hcp_message *message;
561
-
struct nci_conn_info *conn_info;
560
+
const struct nci_hcp_message *message;
561
+
const struct nci_conn_info *conn_info;
562
562
struct nci_data data;
563
563
int r;
564
564
u8 *tmp;
···
605
605
int nci_hci_get_param(struct nci_dev *ndev, u8 gate, u8 idx,
606
606
struct sk_buff **skb)
607
607
{
608
-
struct nci_hcp_message *message;
609
-
struct nci_conn_info *conn_info;
608
+
const struct nci_hcp_message *message;
609
+
const struct nci_conn_info *conn_info;
610
610
struct nci_data data;
611
611
int r;
612
612
u8 pipe = ndev->hci_dev->gate2pipe[gate];
···
697
697
698
698
static int nci_hci_dev_connect_gates(struct nci_dev *ndev,
699
699
u8 gate_count,
700
-
struct nci_hci_gate *gates)
700
+
const struct nci_hci_gate *gates)
701
701
{
702
702
int r;
703
703
···
714
714
715
715
int nci_hci_dev_session_init(struct nci_dev *ndev)
716
716
{
717
-
struct nci_conn_info *conn_info;
717
+
struct nci_conn_info *conn_info;
718
718
struct sk_buff *skb;
719
719
int r;
720
720
+47
-40
net/nfc/nci/ntf.c
+47
-40
net/nfc/nci/ntf.c
···
28
28
/* Handle NCI Notification packets */
29
29
30
30
static void nci_core_reset_ntf_packet(struct nci_dev *ndev,
31
-
struct sk_buff *skb)
31
+
const struct sk_buff *skb)
32
32
{
33
33
/* Handle NCI 2.x core reset notification */
34
-
struct nci_core_reset_ntf *ntf = (void *)skb->data;
34
+
const struct nci_core_reset_ntf *ntf = (void *)skb->data;
35
35
36
36
ndev->nci_ver = ntf->nci_ver;
37
37
pr_debug("nci_ver 0x%x, config_status 0x%x\n",
···
48
48
struct sk_buff *skb)
49
49
{
50
50
struct nci_core_conn_credit_ntf *ntf = (void *) skb->data;
51
-
struct nci_conn_info *conn_info;
51
+
struct nci_conn_info *conn_info;
52
52
int i;
53
53
54
54
pr_debug("num_entries %d\n", ntf->num_entries);
···
80
80
}
81
81
82
82
static void nci_core_generic_error_ntf_packet(struct nci_dev *ndev,
83
-
struct sk_buff *skb)
83
+
const struct sk_buff *skb)
84
84
{
85
85
__u8 status = skb->data[0];
86
86
···
107
107
nci_data_exchange_complete(ndev, NULL, ntf->conn_id, -EIO);
108
108
}
109
109
110
-
static __u8 *nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
111
-
struct rf_tech_specific_params_nfca_poll *nfca_poll,
112
-
__u8 *data)
110
+
static const __u8 *
111
+
nci_extract_rf_params_nfca_passive_poll(struct nci_dev *ndev,
112
+
struct rf_tech_specific_params_nfca_poll *nfca_poll,
113
+
const __u8 *data)
113
114
{
114
115
nfca_poll->sens_res = __le16_to_cpu(*((__le16 *)data));
115
116
data += 2;
···
135
134
return data;
136
135
}
137
136
138
-
static __u8 *nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
139
-
struct rf_tech_specific_params_nfcb_poll *nfcb_poll,
140
-
__u8 *data)
137
+
static const __u8 *
138
+
nci_extract_rf_params_nfcb_passive_poll(struct nci_dev *ndev,
139
+
struct rf_tech_specific_params_nfcb_poll *nfcb_poll,
140
+
const __u8 *data)
141
141
{
142
142
nfcb_poll->sensb_res_len = min_t(__u8, *data++, NFC_SENSB_RES_MAXSIZE);
143
143
···
150
148
return data;
151
149
}
152
150
153
-
static __u8 *nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
154
-
struct rf_tech_specific_params_nfcf_poll *nfcf_poll,
155
-
__u8 *data)
151
+
static const __u8 *
152
+
nci_extract_rf_params_nfcf_passive_poll(struct nci_dev *ndev,
153
+
struct rf_tech_specific_params_nfcf_poll *nfcf_poll,
154
+
const __u8 *data)
156
155
{
157
156
nfcf_poll->bit_rate = *data++;
158
157
nfcf_poll->sensf_res_len = min_t(__u8, *data++, NFC_SENSF_RES_MAXSIZE);
···
167
164
return data;
168
165
}
169
166
170
-
static __u8 *nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
171
-
struct rf_tech_specific_params_nfcv_poll *nfcv_poll,
172
-
__u8 *data)
167
+
static const __u8 *
168
+
nci_extract_rf_params_nfcv_passive_poll(struct nci_dev *ndev,
169
+
struct rf_tech_specific_params_nfcv_poll *nfcv_poll,
170
+
const __u8 *data)
173
171
{
174
172
++data;
175
173
nfcv_poll->dsfid = *data++;
···
179
175
return data;
180
176
}
181
177
182
-
static __u8 *nci_extract_rf_params_nfcf_passive_listen(struct nci_dev *ndev,
183
-
struct rf_tech_specific_params_nfcf_listen *nfcf_listen,
184
-
__u8 *data)
178
+
static const __u8 *
179
+
nci_extract_rf_params_nfcf_passive_listen(struct nci_dev *ndev,
180
+
struct rf_tech_specific_params_nfcf_listen *nfcf_listen,
181
+
const __u8 *data)
185
182
{
186
183
nfcf_listen->local_nfcid2_len = min_t(__u8, *data++,
187
184
NFC_NFCID2_MAXSIZE);
···
203
198
struct nfc_target *target,
204
199
__u8 rf_protocol,
205
200
__u8 rf_tech_and_mode,
206
-
void *params)
201
+
const void *params)
207
202
{
208
-
struct rf_tech_specific_params_nfca_poll *nfca_poll;
209
-
struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
210
-
struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
211
-
struct rf_tech_specific_params_nfcv_poll *nfcv_poll;
203
+
const struct rf_tech_specific_params_nfca_poll *nfca_poll;
204
+
const struct rf_tech_specific_params_nfcb_poll *nfcb_poll;
205
+
const struct rf_tech_specific_params_nfcf_poll *nfcf_poll;
206
+
const struct rf_tech_specific_params_nfcv_poll *nfcv_poll;
212
207
__u32 protocol;
213
208
214
209
if (rf_protocol == NCI_RF_PROTOCOL_T1T)
···
279
274
}
280
275
281
276
static void nci_add_new_target(struct nci_dev *ndev,
282
-
struct nci_rf_discover_ntf *ntf)
277
+
const struct nci_rf_discover_ntf *ntf)
283
278
{
284
279
struct nfc_target *target;
285
280
int i, rc;
···
324
319
}
325
320
326
321
static void nci_rf_discover_ntf_packet(struct nci_dev *ndev,
327
-
struct sk_buff *skb)
322
+
const struct sk_buff *skb)
328
323
{
329
324
struct nci_rf_discover_ntf ntf;
330
-
__u8 *data = skb->data;
325
+
const __u8 *data = skb->data;
331
326
bool add_target = true;
332
327
333
328
ntf.rf_discovery_id = *data++;
···
387
382
}
388
383
389
384
static int nci_extract_activation_params_iso_dep(struct nci_dev *ndev,
390
-
struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
385
+
struct nci_rf_intf_activated_ntf *ntf,
386
+
const __u8 *data)
391
387
{
392
388
struct activation_params_nfca_poll_iso_dep *nfca_poll;
393
389
struct activation_params_nfcb_poll_iso_dep *nfcb_poll;
···
424
418
}
425
419
426
420
static int nci_extract_activation_params_nfc_dep(struct nci_dev *ndev,
427
-
struct nci_rf_intf_activated_ntf *ntf, __u8 *data)
421
+
struct nci_rf_intf_activated_ntf *ntf,
422
+
const __u8 *data)
428
423
{
429
424
struct activation_params_poll_nfc_dep *poll;
430
425
struct activation_params_listen_nfc_dep *listen;
···
461
454
}
462
455
463
456
static void nci_target_auto_activated(struct nci_dev *ndev,
464
-
struct nci_rf_intf_activated_ntf *ntf)
457
+
const struct nci_rf_intf_activated_ntf *ntf)
465
458
{
466
459
struct nfc_target *target;
467
460
int rc;
···
484
477
}
485
478
486
479
static int nci_store_general_bytes_nfc_dep(struct nci_dev *ndev,
487
-
struct nci_rf_intf_activated_ntf *ntf)
480
+
const struct nci_rf_intf_activated_ntf *ntf)
488
481
{
489
482
ndev->remote_gb_len = 0;
490
483
···
526
519
}
527
520
528
521
static void nci_rf_intf_activated_ntf_packet(struct nci_dev *ndev,
529
-
struct sk_buff *skb)
522
+
const struct sk_buff *skb)
530
523
{
531
-
struct nci_conn_info *conn_info;
524
+
struct nci_conn_info *conn_info;
532
525
struct nci_rf_intf_activated_ntf ntf;
533
-
__u8 *data = skb->data;
526
+
const __u8 *data = skb->data;
534
527
int err = NCI_STATUS_OK;
535
528
536
529
ntf.rf_discovery_id = *data++;
···
688
681
}
689
682
690
683
static void nci_rf_deactivate_ntf_packet(struct nci_dev *ndev,
691
-
struct sk_buff *skb)
684
+
const struct sk_buff *skb)
692
685
{
693
-
struct nci_conn_info *conn_info;
694
-
struct nci_rf_deactivate_ntf *ntf = (void *) skb->data;
686
+
const struct nci_conn_info *conn_info;
687
+
const struct nci_rf_deactivate_ntf *ntf = (void *)skb->data;
695
688
696
689
pr_debug("entry, type 0x%x, reason 0x%x\n", ntf->type, ntf->reason);
697
690
···
732
725
}
733
726
734
727
static void nci_nfcee_discover_ntf_packet(struct nci_dev *ndev,
735
-
struct sk_buff *skb)
728
+
const struct sk_buff *skb)
736
729
{
737
730
u8 status = NCI_STATUS_OK;
738
-
struct nci_nfcee_discover_ntf *nfcee_ntf =
731
+
const struct nci_nfcee_discover_ntf *nfcee_ntf =
739
732
(struct nci_nfcee_discover_ntf *)skb->data;
740
733
741
734
pr_debug("\n");
···
752
745
}
753
746
754
747
static void nci_nfcee_action_ntf_packet(struct nci_dev *ndev,
755
-
struct sk_buff *skb)
748
+
const struct sk_buff *skb)
756
749
{
757
750
pr_debug("\n");
758
751
}
+26
-22
net/nfc/nci/rsp.c
+26
-22
net/nfc/nci/rsp.c
···
25
25
26
26
/* Handle NCI Response packets */
27
27
28
-
static void nci_core_reset_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
28
+
static void nci_core_reset_rsp_packet(struct nci_dev *ndev,
29
+
const struct sk_buff *skb)
29
30
{
30
-
struct nci_core_reset_rsp *rsp = (void *) skb->data;
31
+
const struct nci_core_reset_rsp *rsp = (void *)skb->data;
31
32
32
33
pr_debug("status 0x%x\n", rsp->status);
33
34
···
44
43
}
45
44
}
46
45
47
-
static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev, struct sk_buff *skb)
46
+
static u8 nci_core_init_rsp_packet_v1(struct nci_dev *ndev,
47
+
const struct sk_buff *skb)
48
48
{
49
-
struct nci_core_init_rsp_1 *rsp_1 = (void *) skb->data;
50
-
struct nci_core_init_rsp_2 *rsp_2;
49
+
const struct nci_core_init_rsp_1 *rsp_1 = (void *)skb->data;
50
+
const struct nci_core_init_rsp_2 *rsp_2;
51
51
52
52
pr_debug("status 0x%x\n", rsp_1->status);
53
53
···
83
81
return NCI_STATUS_OK;
84
82
}
85
83
86
-
static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev, struct sk_buff *skb)
84
+
static u8 nci_core_init_rsp_packet_v2(struct nci_dev *ndev,
85
+
const struct sk_buff *skb)
87
86
{
88
-
struct nci_core_init_rsp_nci_ver2 *rsp = (void *)skb->data;
89
-
u8 *supported_rf_interface = rsp->supported_rf_interfaces;
87
+
const struct nci_core_init_rsp_nci_ver2 *rsp = (void *)skb->data;
88
+
const u8 *supported_rf_interface = rsp->supported_rf_interfaces;
90
89
u8 rf_interface_idx = 0;
91
90
u8 rf_extension_cnt = 0;
92
91
···
121
118
return NCI_STATUS_OK;
122
119
}
123
120
124
-
static void nci_core_init_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
121
+
static void nci_core_init_rsp_packet(struct nci_dev *ndev, const struct sk_buff *skb)
125
122
{
126
123
u8 status = 0;
127
124
···
163
160
}
164
161
165
162
static void nci_core_set_config_rsp_packet(struct nci_dev *ndev,
166
-
struct sk_buff *skb)
163
+
const struct sk_buff *skb)
167
164
{
168
-
struct nci_core_set_config_rsp *rsp = (void *) skb->data;
165
+
const struct nci_core_set_config_rsp *rsp = (void *)skb->data;
169
166
170
167
pr_debug("status 0x%x\n", rsp->status);
171
168
···
173
170
}
174
171
175
172
static void nci_rf_disc_map_rsp_packet(struct nci_dev *ndev,
176
-
struct sk_buff *skb)
173
+
const struct sk_buff *skb)
177
174
{
178
175
__u8 status = skb->data[0];
179
176
···
182
179
nci_req_complete(ndev, status);
183
180
}
184
181
185
-
static void nci_rf_disc_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb)
182
+
static void nci_rf_disc_rsp_packet(struct nci_dev *ndev,
183
+
const struct sk_buff *skb)
186
184
{
187
-
struct nci_conn_info *conn_info;
185
+
struct nci_conn_info *conn_info;
188
186
__u8 status = skb->data[0];
189
187
190
188
pr_debug("status 0x%x\n", status);
···
214
210
}
215
211
216
212
static void nci_rf_disc_select_rsp_packet(struct nci_dev *ndev,
217
-
struct sk_buff *skb)
213
+
const struct sk_buff *skb)
218
214
{
219
215
__u8 status = skb->data[0];
220
216
···
226
222
}
227
223
228
224
static void nci_rf_deactivate_rsp_packet(struct nci_dev *ndev,
229
-
struct sk_buff *skb)
225
+
const struct sk_buff *skb)
230
226
{
231
227
__u8 status = skb->data[0];
232
228
···
242
238
}
243
239
244
240
static void nci_nfcee_discover_rsp_packet(struct nci_dev *ndev,
245
-
struct sk_buff *skb)
241
+
const struct sk_buff *skb)
246
242
{
247
-
struct nci_nfcee_discover_rsp *discover_rsp;
243
+
const struct nci_nfcee_discover_rsp *discover_rsp;
248
244
249
245
if (skb->len != 2) {
250
246
nci_req_complete(ndev, NCI_STATUS_NFCEE_PROTOCOL_ERROR);
···
259
255
}
260
256
261
257
static void nci_nfcee_mode_set_rsp_packet(struct nci_dev *ndev,
262
-
struct sk_buff *skb)
258
+
const struct sk_buff *skb)
263
259
{
264
260
__u8 status = skb->data[0];
265
261
···
268
264
}
269
265
270
266
static void nci_core_conn_create_rsp_packet(struct nci_dev *ndev,
271
-
struct sk_buff *skb)
267
+
const struct sk_buff *skb)
272
268
{
273
269
__u8 status = skb->data[0];
274
270
struct nci_conn_info *conn_info = NULL;
275
-
struct nci_core_conn_create_rsp *rsp;
271
+
const struct nci_core_conn_create_rsp *rsp;
276
272
277
273
pr_debug("status 0x%x\n", status);
278
274
···
323
319
}
324
320
325
321
static void nci_core_conn_close_rsp_packet(struct nci_dev *ndev,
326
-
struct sk_buff *skb)
322
+
const struct sk_buff *skb)
327
323
{
328
324
struct nci_conn_info *conn_info;
329
325
__u8 status = skb->data[0];
+1
-1
net/nfc/nci/spi.c
+1
-1
net/nfc/nci/spi.c
+1
-1
net/nfc/netlink.c
+1
-1
net/nfc/netlink.c
+1
-1
net/nfc/nfc.h
+1
-1
net/nfc/nfc.h
···
48
48
u8 comm_mode, u8 rf_mode);
49
49
int nfc_llcp_register_device(struct nfc_dev *dev);
50
50
void nfc_llcp_unregister_device(struct nfc_dev *dev);
51
-
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, u8 *gb, u8 gb_len);
51
+
int nfc_llcp_set_remote_gb(struct nfc_dev *dev, const u8 *gb, u8 gb_len);
52
52
u8 *nfc_llcp_general_bytes(struct nfc_dev *dev, size_t *general_bytes_len);
53
53
int nfc_llcp_data_received(struct nfc_dev *dev, struct sk_buff *skb);
54
54
struct nfc_llcp_local *nfc_llcp_find_local(struct nfc_dev *dev);