summaryrefslogtreecommitdiffstats
path: root/net/nfc/nci
diff options
context:
space:
mode:
authorRobert Dolca <robert.dolca@intel.com>2015-10-26 13:58:54 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-28 06:44:45 +0100
commitf11631748ee6973f85238109a3fa8ab8e760e5a4 (patch)
treeb95898200f6a7c40dda4f954847dd098af75b081 /net/nfc/nci
parentd8e018c0b3211902af1bfb5d5b280f955a4633b7 (diff)
downloadlinux-f11631748ee6973f85238109a3fa8ab8e760e5a4.tar.bz2
NFC: nci: non-static functions can not be inline
This fixes a build error that seems to be toochain dependent (Not seen with gcc v5.1): In file included from net/nfc/nci/rsp.c:36:0: net/nfc/nci/rsp.c: In function ‘nci_rsp_packet’: include/net/nfc/nci_core.h:355:12: error: inlining failed in call to always_inline ‘nci_prop_rsp_packet’: function body not available inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode, Signed-off-by: Robert Dolca <robert.dolca@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/nci')
-rw-r--r--net/nfc/nci/core.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c
index 2da03c08dad2..10c99a578421 100644
--- a/net/nfc/nci/core.c
+++ b/net/nfc/nci/core.c
@@ -1316,29 +1316,29 @@ static int nci_op_ntf_packet(struct nci_dev *ndev, __u16 ntf_opcode,
return op->ntf(ndev, skb);
}
-inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,
- struct sk_buff *skb)
+int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,
+ struct sk_buff *skb)
{
return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->prop_ops,
ndev->ops->n_prop_ops);
}
-inline int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,
- struct sk_buff *skb)
+int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,
+ struct sk_buff *skb)
{
return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->prop_ops,
ndev->ops->n_prop_ops);
}
-inline int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,
- struct sk_buff *skb)
+int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,
+ struct sk_buff *skb)
{
return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->core_ops,
ndev->ops->n_core_ops);
}
-inline int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
- struct sk_buff *skb)
+int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
+ struct sk_buff *skb)
{
return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->core_ops,
ndev->ops->n_core_ops);