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

Commit 9bec44bf authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz
Browse files

NFC: NCI: Use reinit_completion() at appropriate places 



Calling init_completion() once is enough.
Then use reinit_completion() instead in __nci_request() and nci_spi_send().

Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 6ea7398d

net/nfc/nci/core.c

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int __nci_request(struct nci_dev *ndev, 


	ndev->req_status = NCI_REQ_PEND;



	init_completion(&ndev->req_completion);

	reinit_completion(&ndev->req_completion);

	req(ndev, opt);

	completion_rc =

		wait_for_completion_interruptible_timeout(&ndev->req_completion,
@@ -709,6 +709,7 @@ struct nci_dev *nci_allocate_device(struct nci_ops *ops, 
	ndev->ops = ops;

	ndev->tx_headroom = tx_headroom;

	ndev->tx_tailroom = tx_tailroom;

	init_completion(&ndev->req_completion);



	ndev->nfc_dev = nfc_allocate_device(&nci_nfc_ops,

					    supported_protocols,

net/nfc/nci/spi.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int nci_spi_send(struct nci_spi *nspi, 
	if (ret != 0 || nspi->acknowledge_mode == NCI_SPI_CRC_DISABLED)

		goto done;



	init_completion(&nspi->req_completion);

	reinit_completion(&nspi->req_completion);

	completion_rc =	wait_for_completion_interruptible_timeout(

							&nspi->req_completion,

							NCI_SPI_SEND_TIMEOUT);
@@ -145,6 +145,7 @@ struct nci_spi *nci_spi_allocate_spi(struct spi_device *spi, 


	nspi->spi = spi;

	nspi->ndev = ndev;

	init_completion(&nspi->req_completion);



	return nspi;

}