Commit 21d19f87 authored by Samuel Ortiz's avatar Samuel Ortiz

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: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f6d3125f
...@@ -540,7 +540,7 @@ static void nci_nfcee_discover_req(struct nci_dev *ndev, unsigned long opt) ...@@ -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) 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)); msecs_to_jiffies(NCI_CMD_TIMEOUT));
} }
EXPORT_SYMBOL(nci_nfcee_discover); EXPORT_SYMBOL(nci_nfcee_discover);
...@@ -561,7 +561,8 @@ int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode) ...@@ -561,7 +561,8 @@ int nci_nfcee_mode_set(struct nci_dev *ndev, u8 nfcee_id, u8 nfcee_mode)
cmd.nfcee_id = nfcee_id; cmd.nfcee_id = nfcee_id;
cmd.nfcee_mode = nfcee_mode; cmd.nfcee_mode = nfcee_mode;
return nci_request(ndev, nci_nfcee_mode_set_req, (unsigned long)&cmd, return __nci_request(ndev, nci_nfcee_mode_set_req,
(unsigned long)&cmd,
msecs_to_jiffies(NCI_CMD_TIMEOUT)); msecs_to_jiffies(NCI_CMD_TIMEOUT));
} }
EXPORT_SYMBOL(nci_nfcee_mode_set); EXPORT_SYMBOL(nci_nfcee_mode_set);
...@@ -612,7 +613,7 @@ static void nci_core_conn_close_req(struct nci_dev *ndev, unsigned long opt) ...@@ -612,7 +613,7 @@ 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) int nci_core_conn_close(struct nci_dev *ndev, u8 conn_id)
{ {
return nci_request(ndev, nci_core_conn_close_req, conn_id, return __nci_request(ndev, nci_core_conn_close_req, conn_id,
msecs_to_jiffies(NCI_CMD_TIMEOUT)); msecs_to_jiffies(NCI_CMD_TIMEOUT));
} }
EXPORT_SYMBOL(nci_core_conn_close); EXPORT_SYMBOL(nci_core_conn_close);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment