change wifi driver to cypress

hc

2024-01-05 071106ecf68c401173c58808b1cf5f68cc50d390

 kernel/drivers/nfc/fdp/fdp.c
..
..
@@ -1,15 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
1
2
 /* -------------------------------------------------------------------------
2
3
  * Copyright (C) 2014-2016, Intel Corporation
3
4
  *
4
- *  This program is free software; you can redistribute it and/or modify
5
- *  it under the terms of the GNU General Public License as published by
6
- *  the Free Software Foundation; either version 2 of the License, or
7
- *  (at your option) any later version.
8
- *
9
- *  This program is distributed in the hope that it will be useful,
10
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
11
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12
- *  GNU General Public License for more details.
13
5
  * -------------------------------------------------------------------------
14
6
  */
15
7
 
..
..
@@ -84,7 +76,7 @@
84
76
 struct nci_core_get_config_rsp {
85
77
 	u8 status;
86
78
 	u8 count;
87
-	u8 data[0];
79
+	u8 data[];
88
80
 };
89
81
 
90
82
 static int fdp_nci_create_conn(struct nci_dev *ndev)
..
..
@@ -246,9 +238,6 @@
246
238
 {
247
239
 	int r;
248
240
 	struct fdp_nci_info *info = nci_get_drvdata(ndev);
249
-	struct device *dev = &info->phy->i2c_dev->dev;
250
-
251
-	dev_dbg(dev, "%s\n", __func__);
252
241
 
253
242
 	r = info->phy_ops->enable(info->phy);
254
243
 
..
..
@@ -257,35 +246,26 @@
257
246
 
258
247
 static int fdp_nci_close(struct nci_dev *ndev)
259
248
 {
260
-	struct fdp_nci_info *info = nci_get_drvdata(ndev);
261
-	struct device *dev = &info->phy->i2c_dev->dev;
262
-
263
-	dev_dbg(dev, "%s\n", __func__);
264
249
 	return 0;
265
250
 }
266
251
 
267
252
 static int fdp_nci_send(struct nci_dev *ndev, struct sk_buff *skb)
268
253
 {
269
254
 	struct fdp_nci_info *info = nci_get_drvdata(ndev);
270
-	struct device *dev = &info->phy->i2c_dev->dev;
271
-
272
-	dev_dbg(dev, "%s\n", __func__);
255
+	int ret;
273
256
 
274
257
 	if (atomic_dec_and_test(&info->data_pkt_counter))
275
258
 		info->data_pkt_counter_cb(ndev);
276
259
 
277
-	return info->phy_ops->write(info->phy, skb);
278
-}
260
+	ret = info->phy_ops->write(info->phy, skb);
261
+	if (ret < 0) {
262
+		kfree_skb(skb);
263
+		return ret;
264
+	}
279
265
 
280
-int fdp_nci_recv_frame(struct nci_dev *ndev, struct sk_buff *skb)
281
-{
282
-	struct fdp_nci_info *info = nci_get_drvdata(ndev);
283
-	struct device *dev = &info->phy->i2c_dev->dev;
284
-
285
-	dev_dbg(dev, "%s\n", __func__);
286
-	return nci_recv_frame(ndev, skb);
266
+	consume_skb(skb);
267
+	return 0;
287
268
 }
288
-EXPORT_SYMBOL(fdp_nci_recv_frame);
289
269
 
290
270
 static int fdp_nci_request_firmware(struct nci_dev *ndev)
291
271
 {
..
..
@@ -497,8 +477,6 @@
497
477
 	int r;
498
478
 	u8 patched = 0;
499
479
 
500
-	dev_dbg(dev, "%s\n", __func__);
501
-
502
480
 	r = nci_core_init(ndev);
503
481
 	if (r)
504
482
 		goto error;
..
..
@@ -606,9 +584,7 @@
606
584
 					  struct sk_buff *skb)
607
585
 {
608
586
 	struct fdp_nci_info *info = nci_get_drvdata(ndev);
609
-	struct device *dev = &info->phy->i2c_dev->dev;
610
587
 
611
-	dev_dbg(dev, "%s\n", __func__);
612
588
 	info->setup_reset_ntf = 1;
613
589
 	wake_up(&info->setup_wq);
614
590
 
..
..
@@ -619,9 +595,7 @@
619
595
 					  struct sk_buff *skb)
620
596
 {
621
597
 	struct fdp_nci_info *info = nci_get_drvdata(ndev);
622
-	struct device *dev = &info->phy->i2c_dev->dev;
623
598
 
624
-	dev_dbg(dev, "%s\n", __func__);
625
599
 	info->setup_patch_ntf = 1;
626
600
 	info->setup_patch_status = skb->data[0];
627
601
 	wake_up(&info->setup_wq);
..
..
@@ -794,11 +768,6 @@
794
768
 
795
769
 void fdp_nci_remove(struct nci_dev *ndev)
796
770
 {
797
-	struct fdp_nci_info *info = nci_get_drvdata(ndev);
798
-	struct device *dev = &info->phy->i2c_dev->dev;
799
-
800
-	dev_dbg(dev, "%s\n", __func__);
801
-
802
771
 	nci_unregister_device(ndev);
803
772
 	nci_free_device(ndev);
804
773
 }