Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b9fcda9 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Samuel Ortiz
Browse files

NFC: fdp: Convert to use devres API 



It looks like there are two leftovers, at least one of which can leak
the resource (IRQ).

Convert both places to use managed variants of the functions.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 8597c092

drivers/nfc/fdp/fdp.c

+4 −11
Original line number Diff line number Diff line
@@ -749,11 +749,9 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops, 
	u32 protocols;

	int r;



	info = kzalloc(sizeof(struct fdp_nci_info), GFP_KERNEL);

	if (!info) {

		r = -ENOMEM;

		goto err_info_alloc;

	}

	info = devm_kzalloc(dev, sizeof(struct fdp_nci_info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;



	info->phy = phy;

	info->phy_ops = phy_ops;
@@ -775,8 +773,7 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops, 
				   tx_tailroom);

	if (!ndev) {

		nfc_err(dev, "Cannot allocate nfc ndev\n");

		r = -ENOMEM;

		goto err_alloc_ndev;

		return -ENOMEM;

	}



	r = nci_register_device(ndev);
@@ -792,9 +789,6 @@ int fdp_nci_probe(struct fdp_i2c_phy *phy, struct nfc_phy_ops *phy_ops, 


err_regdev:

	nci_free_device(ndev);

err_alloc_ndev:

	kfree(info);

err_info_alloc:

	return r;

}

EXPORT_SYMBOL(fdp_nci_probe);
@@ -808,7 +802,6 @@ void fdp_nci_remove(struct nci_dev *ndev) 


	nci_unregister_device(ndev);

	nci_free_device(ndev);

	kfree(info);

}

EXPORT_SYMBOL(fdp_nci_remove);

drivers/nfc/fdp/i2c.c

+5 −5
Original line number Diff line number Diff line
@@ -303,8 +303,7 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) 
		return -ENODEV;

	}



	phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy),

			   GFP_KERNEL);

	phy = devm_kzalloc(dev, sizeof(struct fdp_i2c_phy), GFP_KERNEL);

	if (!phy)

		return -ENOMEM;
@@ -312,7 +311,8 @@ static int fdp_nci_i2c_probe(struct i2c_client *client) 
	phy->next_read_size = FDP_NCI_I2C_MIN_PAYLOAD;

	i2c_set_clientdata(client, phy);



	r = request_threaded_irq(client->irq, NULL, fdp_nci_i2c_irq_thread_fn,

	r = devm_request_threaded_irq(dev, client->irq,

				      NULL, fdp_nci_i2c_irq_thread_fn,

				      IRQF_TRIGGER_RISING | IRQF_ONESHOT,

				      FDP_I2C_DRIVER_NAME, phy);