NFC: nci: Use __nci_request for exported routines

Since we do not know in which context drivers will call these
routines, they should use the unlocked version of nci_request,
i.e. __nci_request.
It is up to drivers to know/decide if they need to take the
req_lock mutex before calling those routines. When being called
from the NCI setup routine there is no need to do so as ops->setup
is called under req_lock.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 943889b87a34bdd33e9c4a8c1b01df04808b3e00..090972033a15e2c745a4b2a3721892583b0825b9 100644 (file)
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -540,7 +540,7 @@ static void nci_nfcee_discover_req(struct nci_dev *ndev, unsigned long opt)
 
 int nci_nfcee_discover(struct nci_dev *ndev, u8 action)
 {
-       return nci_request(ndev, nci_nfcee_discover_req, action,
+       return __nci_request(ndev, nci_nfcee_discover_req, action,
                                msecs_to_jiffies(NCI_CMD_TIMEOUT));
 }
 EXPORT_SYMBOL(nci_nfcee_discover);
@@ -561,8 +561,9 @@ int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode)
        cmd.nfcee_id = nfcee_id;
        cmd.nfcee_mode = nfcee_mode;
 
-       return nci_request(ndev, nci_nfcee_mode_set_req, (unsigned long)&cmd,
-                          msecs_to_jiffies(NCI_CMD_TIMEOUT));
+       return __nci_request(ndev, nci_nfcee_mode_set_req,
+                            (unsigned long)&cmd,
+                            msecs_to_jiffies(NCI_CMD_TIMEOUT));
 }
 EXPORT_SYMBOL(nci_nfcee_mode_set);
 
@@ -612,8 +613,8 @@ static void nci_core_conn_close_req(struct nci_dev *ndev, unsigned long opt)
 
 int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id)
 {
-       return nci_request(ndev, nci_core_conn_close_req, conn_id,
-                               msecs_to_jiffies(NCI_CMD_TIMEOUT));
+       return __nci_request(ndev, nci_core_conn_close_req, conn_id,
+                            msecs_to_jiffies(NCI_CMD_TIMEOUT));
 }
 EXPORT_SYMBOL(nci_core_conn_close);