Skip to content

Commit ff7f0e4

Browse files
kuba-mookuba-moo
committed
Merge branch 'nfc-minor-printk-cleanup'
Krzysztof Kozlowski says: ==================== nfc: minor printk cleanup v2: Correct SPDX license in patch 2/7 (as Joe pointed out). v1: Remove unused variable in pn533 (reported by kbuild). ==================== Link: https://lore.kernel.org/r/20211011133835.236347-1-krzysztof.kozlowski@canonical.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 311c13d + f41e137 commit ff7f0e4

File tree

19 files changed

+21
-140
lines changed

19 files changed

+21
-140
lines changed

‎drivers/nfc/microread/i2c.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,6 @@ static int microread_i2c_probe(struct i2c_client *client,
237237
struct microread_i2c_phy *phy;
238238
int r;
239239

240-
dev_dbg(&client->dev, "client %p\n", client);
241-
242240
phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy),
243241
GFP_KERNEL);
244242
if (!phy)
@@ -262,8 +260,6 @@ static int microread_i2c_probe(struct i2c_client *client,
262260
if (r < 0)
263261
goto err_irq;
264262

265-
nfc_info(&client->dev, "Probed\n");
266-
267263
return 0;
268264

269265
err_irq:

‎drivers/nfc/microread/mei.c‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ static int microread_mei_probe(struct mei_cl_device *cldev,
2323
struct nfc_mei_phy *phy;
2424
int r;
2525

26-
pr_info("Probing NFC microread\n");
27-
2826
phy = nfc_mei_phy_alloc(cldev);
2927
if (!phy)
3028
return -ENOMEM;

‎drivers/nfc/s3fwrn5/firmware.c‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -357,24 +357,23 @@ s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo)
357357

358358
int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info)
359359
{
360+
struct device *dev = &fw_info->ndev->nfc_dev->dev;
360361
struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo;
361362
int ret;
362363

363364
/* Get bootloader info */
364365

365366
ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo);
366367
if (ret < 0) {
367-
dev_err(&fw_info->ndev->nfc_dev->dev,
368-
"Failed to get bootinfo, ret=%02x\n", ret);
368+
dev_err(dev, "Failed to get bootinfo, ret=%02x\n", ret);
369369
goto err;
370370
}
371371

372372
/* Match hardware version to obtain firmware base address */
373373

374374
ret = s3fwrn5_fw_get_base_addr(&bootinfo, &fw_info->base_addr);
375375
if (ret < 0) {
376-
dev_err(&fw_info->ndev->nfc_dev->dev,
377-
"Unknown hardware version\n");
376+
dev_err(dev, "Unknown hardware version\n");
378377
goto err;
379378
}
380379

@@ -409,6 +408,7 @@ bool s3fwrn5_fw_check_version(const struct s3fwrn5_fw_info *fw_info, u32 version
409408

410409
int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
411410
{
411+
struct device *dev = &fw_info->ndev->nfc_dev->dev;
412412
struct s3fwrn5_fw_image *fw = &fw_info->fw;
413413
u8 hash_data[SHA1_DIGEST_SIZE];
414414
struct crypto_shash *tfm;
@@ -421,52 +421,45 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
421421

422422
tfm = crypto_alloc_shash("sha1", 0, 0);
423423
if (IS_ERR(tfm)) {
424-
dev_err(&fw_info->ndev->nfc_dev->dev,
425-
"Cannot allocate shash (code=%pe)\n", tfm);
424+
dev_err(dev, "Cannot allocate shash (code=%pe)\n", tfm);
426425
return PTR_ERR(tfm);
427426
}
428427

429428
ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);
430429

431430
crypto_free_shash(tfm);
432431
if (ret) {
433-
dev_err(&fw_info->ndev->nfc_dev->dev,
434-
"Cannot compute hash (code=%d)\n", ret);
432+
dev_err(dev, "Cannot compute hash (code=%d)\n", ret);
435433
return ret;
436434
}
437435

438436
/* Firmware update process */
439437

440-
dev_info(&fw_info->ndev->nfc_dev->dev,
441-
"Firmware update: %s\n", fw_info->fw_name);
438+
dev_info(dev, "Firmware update: %s\n", fw_info->fw_name);
442439

443440
ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data,
444441
SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size);
445442
if (ret < 0) {
446-
dev_err(&fw_info->ndev->nfc_dev->dev,
447-
"Unable to enter update mode\n");
443+
dev_err(dev, "Unable to enter update mode\n");
448444
return ret;
449445
}
450446

451447
for (off = 0; off < image_size; off += fw_info->sector_size) {
452448
ret = s3fwrn5_fw_update_sector(fw_info,
453449
fw_info->base_addr + off, fw->image + off);
454450
if (ret < 0) {
455-
dev_err(&fw_info->ndev->nfc_dev->dev,
456-
"Firmware update error (code=%d)\n", ret);
451+
dev_err(dev, "Firmware update error (code=%d)\n", ret);
457452
return ret;
458453
}
459454
}
460455

461456
ret = s3fwrn5_fw_complete_update_mode(fw_info);
462457
if (ret < 0) {
463-
dev_err(&fw_info->ndev->nfc_dev->dev,
464-
"Unable to complete update mode\n");
458+
dev_err(dev, "Unable to complete update mode\n");
465459
return ret;
466460
}
467461

468-
dev_info(&fw_info->ndev->nfc_dev->dev,
469-
"Firmware update: success\n");
462+
dev_info(dev, "Firmware update: success\n");
470463

471464
return ret;
472465
}

‎drivers/nfc/s3fwrn5/nci.c‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = {
4747

4848
int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)
4949
{
50+
struct device *dev = &info->ndev->nfc_dev->dev;
5051
const struct firmware *fw;
5152
struct nci_prop_fw_cfg_cmd fw_cfg;
5253
struct nci_prop_set_rfreg_cmd set_rfreg;
@@ -55,7 +56,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)
5556
int i, len;
5657
int ret;
5758

58-
ret = request_firmware(&fw, fw_name, &info->ndev->nfc_dev->dev);
59+
ret = request_firmware(&fw, fw_name, dev);
5960
if (ret < 0)
6061
return ret;
6162

@@ -77,13 +78,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)
7778

7879
/* Start rfreg configuration */
7980

80-
dev_info(&info->ndev->nfc_dev->dev,
81-
"rfreg configuration update: %s\n", fw_name);
81+
dev_info(dev, "rfreg configuration update: %s\n", fw_name);
8282

8383
ret = nci_prop_cmd(info->ndev, NCI_PROP_START_RFREG, 0, NULL);
8484
if (ret < 0) {
85-
dev_err(&info->ndev->nfc_dev->dev,
86-
"Unable to start rfreg update\n");
85+
dev_err(dev, "Unable to start rfreg update\n");
8786
goto out;
8887
}
8988

@@ -97,8 +96,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)
9796
ret = nci_prop_cmd(info->ndev, NCI_PROP_SET_RFREG,
9897
len+1, (__u8 *)&set_rfreg);
9998
if (ret < 0) {
100-
dev_err(&info->ndev->nfc_dev->dev,
101-
"rfreg update error (code=%d)\n", ret);
99+
dev_err(dev, "rfreg update error (code=%d)\n", ret);
102100
goto out;
103101
}
104102
set_rfreg.index++;
@@ -110,13 +108,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)
110108
ret = nci_prop_cmd(info->ndev, NCI_PROP_STOP_RFREG,
111109
sizeof(stop_rfreg), (__u8 *)&stop_rfreg);
112110
if (ret < 0) {
113-
dev_err(&info->ndev->nfc_dev->dev,
114-
"Unable to stop rfreg update\n");
111+
dev_err(dev, "Unable to stop rfreg update\n");
115112
goto out;
116113
}
117114

118-
dev_info(&info->ndev->nfc_dev->dev,
119-
"rfreg configuration update: success\n");
115+
dev_info(dev, "rfreg configuration update: success\n");
120116
out:
121117
release_firmware(fw);
122118
return ret;

‎drivers/nfc/st-nci/i2c.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy,
157157
static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)
158158
{
159159
struct st_nci_i2c_phy *phy = phy_id;
160-
struct i2c_client *client;
161160
struct sk_buff *skb = NULL;
162161
int r;
163162

@@ -166,9 +165,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)
166165
return IRQ_NONE;
167166
}
168167

169-
client = phy->i2c_dev;
170-
dev_dbg(&client->dev, "IRQ\n");
171-
172168
if (phy->ndlc->hard_fault)
173169
return IRQ_HANDLED;
174170

‎drivers/nfc/st-nci/ndlc.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,17 +239,13 @@ static void ndlc_t1_timeout(struct timer_list *t)
239239
{
240240
struct llt_ndlc *ndlc = from_timer(ndlc, t, t1_timer);
241241

242-
pr_debug("\n");
243-
244242
schedule_work(&ndlc->sm_work);
245243
}
246244

247245
static void ndlc_t2_timeout(struct timer_list *t)
248246
{
249247
struct llt_ndlc *ndlc = from_timer(ndlc, t, t2_timer);
250248

251-
pr_debug("\n");
252-
253249
schedule_work(&ndlc->sm_work);
254250
}
255251

‎drivers/nfc/st-nci/se.c‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,6 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx,
638638
{
639639
struct st_nci_info *info = nci_get_drvdata(ndev);
640640

641-
pr_debug("\n");
642-
643641
switch (se_idx) {
644642
case ST_NCI_ESE_HOST_ID:
645643
info->se_info.cb = cb;
@@ -671,8 +669,6 @@ static void st_nci_se_wt_timeout(struct timer_list *t)
671669
u8 param = 0x01;
672670
struct st_nci_info *info = from_timer(info, t, se_info.bwi_timer);
673671

674-
pr_debug("\n");
675-
676672
info->se_info.bwi_active = false;
677673

678674
if (!info->se_info.xch_error) {
@@ -692,8 +688,6 @@ static void st_nci_se_activation_timeout(struct timer_list *t)
692688
struct st_nci_info *info = from_timer(info, t,
693689
se_info.se_active_timer);
694690

695-
pr_debug("\n");
696-
697691
info->se_info.se_active = false;
698692

699693
complete(&info->se_info.req_completion);

‎drivers/nfc/st-nci/spi.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ static int st_nci_spi_read(struct st_nci_spi_phy *phy,
169169
static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)
170170
{
171171
struct st_nci_spi_phy *phy = phy_id;
172-
struct spi_device *dev;
173172
struct sk_buff *skb = NULL;
174173
int r;
175174

@@ -178,9 +177,6 @@ static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)
178177
return IRQ_NONE;
179178
}
180179

181-
dev = phy->spi_dev;
182-
dev_dbg(&dev->dev, "IRQ\n");
183-
184180
if (phy->ndlc->hard_fault)
185181
return IRQ_HANDLED;
186182

‎drivers/nfc/st21nfca/i2c.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ static int st21nfca_hci_i2c_read(struct st21nfca_i2c_phy *phy,
421421
static irqreturn_t st21nfca_hci_irq_thread_fn(int irq, void *phy_id)
422422
{
423423
struct st21nfca_i2c_phy *phy = phy_id;
424-
struct i2c_client *client;
425424

426425
int r;
427426

@@ -430,9 +429,6 @@ static irqreturn_t st21nfca_hci_irq_thread_fn(int irq, void *phy_id)
430429
return IRQ_NONE;
431430
}
432431

433-
client = phy->i2c_dev;
434-
dev_dbg(&client->dev, "IRQ\n");
435-
436432
if (phy->hard_fault != 0)
437433
return IRQ_HANDLED;
438434

‎drivers/nfc/st21nfca/se.c‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -257,8 +257,6 @@ static void st21nfca_se_wt_timeout(struct timer_list *t)
257257
struct st21nfca_hci_info *info = from_timer(info, t,
258258
se_info.bwi_timer);
259259

260-
pr_debug("\n");
261-
262260
info->se_info.bwi_active = false;
263261

264262
if (!info->se_info.xch_error) {
@@ -278,8 +276,6 @@ static void st21nfca_se_activation_timeout(struct timer_list *t)
278276
struct st21nfca_hci_info *info = from_timer(info, t,
279277
se_info.se_active_timer);
280278

281-
pr_debug("\n");
282-
283279
info->se_info.se_active = false;
284280

285281
complete(&info->se_info.req_completion);

0 commit comments

Comments
 (0)