Commit ff7f0e4e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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: default avatarJakub Kicinski <kuba@kernel.org>
parents 311c13dd f41e137a

drivers/nfc/microread/i2c.c

+0 −4
Original line number Diff line number Diff line
@@ -237,8 +237,6 @@ static int microread_i2c_probe(struct i2c_client *client, 
	struct microread_i2c_phy *phy;

	int r;



	dev_dbg(&client->dev, "client %p\n", client);



	phy = devm_kzalloc(&client->dev, sizeof(struct microread_i2c_phy),

			   GFP_KERNEL);

	if (!phy)
@@ -262,8 +260,6 @@ static int microread_i2c_probe(struct i2c_client *client, 
	if (r < 0)

		goto err_irq;



	nfc_info(&client->dev, "Probed\n");



	return 0;



err_irq:

drivers/nfc/microread/mei.c

+0 −2
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ static int microread_mei_probe(struct mei_cl_device *cldev, 
	struct nfc_mei_phy *phy;

	int r;



	pr_info("Probing NFC microread\n");



	phy = nfc_mei_phy_alloc(cldev);

	if (!phy)

		return -ENOMEM;

drivers/nfc/s3fwrn5/firmware.c

+11 −18
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ s3fwrn5_fw_is_custom(const struct s3fwrn5_fw_cmd_get_bootinfo_rsp *bootinfo) 


int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info)

{

	struct device *dev = &fw_info->ndev->nfc_dev->dev;

	struct s3fwrn5_fw_cmd_get_bootinfo_rsp bootinfo;

	int ret;
@@ -364,8 +365,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) 


	ret = s3fwrn5_fw_get_bootinfo(fw_info, &bootinfo);

	if (ret < 0) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Failed to get bootinfo, ret=%02x\n", ret);

		dev_err(dev, "Failed to get bootinfo, ret=%02x\n", ret);

		goto err;

	}
@@ -373,8 +373,7 @@ int s3fwrn5_fw_setup(struct s3fwrn5_fw_info *fw_info) 


	ret = s3fwrn5_fw_get_base_addr(&bootinfo, &fw_info->base_addr);

	if (ret < 0) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Unknown hardware version\n");

		dev_err(dev, "Unknown hardware version\n");

		goto err;

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


int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)

{

	struct device *dev = &fw_info->ndev->nfc_dev->dev;

	struct s3fwrn5_fw_image *fw = &fw_info->fw;

	u8 hash_data[SHA1_DIGEST_SIZE];

	struct crypto_shash *tfm;
@@ -421,8 +421,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) 


	tfm = crypto_alloc_shash("sha1", 0, 0);

	if (IS_ERR(tfm)) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Cannot allocate shash (code=%pe)\n", tfm);

		dev_err(dev, "Cannot allocate shash (code=%pe)\n", tfm);

		return PTR_ERR(tfm);

	}
@@ -430,21 +429,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) 


	crypto_free_shash(tfm);

	if (ret) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Cannot compute hash (code=%d)\n", ret);

		dev_err(dev, "Cannot compute hash (code=%d)\n", ret);

		return ret;

	}



	/* Firmware update process */



	dev_info(&fw_info->ndev->nfc_dev->dev,

		"Firmware update: %s\n", fw_info->fw_name);

	dev_info(dev, "Firmware update: %s\n", fw_info->fw_name);



	ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data,

		SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size);

	if (ret < 0) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Unable to enter update mode\n");

		dev_err(dev, "Unable to enter update mode\n");

		return ret;

	}
@@ -452,21 +448,18 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info) 
		ret = s3fwrn5_fw_update_sector(fw_info,

			fw_info->base_addr + off, fw->image + off);

		if (ret < 0) {

			dev_err(&fw_info->ndev->nfc_dev->dev,

				"Firmware update error (code=%d)\n", ret);

			dev_err(dev, "Firmware update error (code=%d)\n", ret);

			return ret;

		}

	}



	ret = s3fwrn5_fw_complete_update_mode(fw_info);

	if (ret < 0) {

		dev_err(&fw_info->ndev->nfc_dev->dev,

			"Unable to complete update mode\n");

		dev_err(dev, "Unable to complete update mode\n");

		return ret;

	}



	dev_info(&fw_info->ndev->nfc_dev->dev,

		"Firmware update: success\n");

	dev_info(dev, "Firmware update: success\n");



	return ret;

}

drivers/nfc/s3fwrn5/nci.c

+7 −11
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ const struct nci_driver_ops s3fwrn5_nci_prop_ops[4] = { 


int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name)

{

	struct device *dev = &info->ndev->nfc_dev->dev;

	const struct firmware *fw;

	struct nci_prop_fw_cfg_cmd fw_cfg;

	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) 
	int i, len;

	int ret;



	ret = request_firmware(&fw, fw_name, &info->ndev->nfc_dev->dev);

	ret = request_firmware(&fw, fw_name, dev);

	if (ret < 0)

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


	/* Start rfreg configuration */



	dev_info(&info->ndev->nfc_dev->dev,

		"rfreg configuration update: %s\n", fw_name);

	dev_info(dev, "rfreg configuration update: %s\n", fw_name);



	ret = nci_prop_cmd(info->ndev, NCI_PROP_START_RFREG, 0, NULL);

	if (ret < 0) {

		dev_err(&info->ndev->nfc_dev->dev,

			"Unable to start rfreg update\n");

		dev_err(dev, "Unable to start rfreg update\n");

		goto out;

	}
@@ -97,8 +96,7 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) 
		ret = nci_prop_cmd(info->ndev, NCI_PROP_SET_RFREG,

			len+1, (__u8 *)&set_rfreg);

		if (ret < 0) {

			dev_err(&info->ndev->nfc_dev->dev,

				"rfreg update error (code=%d)\n", ret);

			dev_err(dev, "rfreg update error (code=%d)\n", ret);

			goto out;

		}

		set_rfreg.index++;
@@ -110,13 +108,11 @@ int s3fwrn5_nci_rf_configure(struct s3fwrn5_info *info, const char *fw_name) 
	ret = nci_prop_cmd(info->ndev, NCI_PROP_STOP_RFREG,

		sizeof(stop_rfreg), (__u8 *)&stop_rfreg);

	if (ret < 0) {

		dev_err(&info->ndev->nfc_dev->dev,

			"Unable to stop rfreg update\n");

		dev_err(dev, "Unable to stop rfreg update\n");

		goto out;

	}



	dev_info(&info->ndev->nfc_dev->dev,

		"rfreg configuration update: success\n");

	dev_info(dev, "rfreg configuration update: success\n");

out:

	release_firmware(fw);

	return ret;

drivers/nfc/st-nci/i2c.c

+0 −4
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ static int st_nci_i2c_read(struct st_nci_i2c_phy *phy, 
static irqreturn_t st_nci_irq_thread_fn(int irq, void *phy_id)

{

	struct st_nci_i2c_phy *phy = phy_id;

	struct i2c_client *client;

	struct sk_buff *skb = NULL;

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

	}



	client = phy->i2c_dev;

	dev_dbg(&client->dev, "IRQ\n");



	if (phy->ndlc->hard_fault)

		return IRQ_HANDLED;