summaryrefslogtreecommitdiffstats
path: root/net/nfc
diff options
context:
space:
mode:
authorRobert Dolca <robert.dolca@intel.com>2015-10-26 07:58:54 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2015-10-28 01:44:45 -0400
commitf11631748ee6973f85238109a3fa8ab8e760e5a4 (patch)
treeb95898200f6a7c40dda4f954847dd098af75b081 /net/nfc
parentd8e018c0b3211902af1bfb5d5b280f955a4633b7 (diff)
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')
-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,
1316 return op->ntf(ndev, skb); 1316 return op->ntf(ndev, skb);
1317} 1317}
1318 1318
1319inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode, 1319int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,
1320 struct sk_buff *skb) 1320 struct sk_buff *skb)
1321{ 1321{
1322 return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->prop_ops, 1322 return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->prop_ops,
1323 ndev->ops->n_prop_ops); 1323 ndev->ops->n_prop_ops);
1324} 1324}
1325 1325
1326inline int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode, 1326int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,
1327 struct sk_buff *skb) 1327 struct sk_buff *skb)
1328{ 1328{
1329 return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->prop_ops, 1329 return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->prop_ops,
1330 ndev->ops->n_prop_ops); 1330 ndev->ops->n_prop_ops);
1331} 1331}
1332 1332
1333inline int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode, 1333int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,
1334 struct sk_buff *skb) 1334 struct sk_buff *skb)
1335{ 1335{
1336 return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->core_ops, 1336 return nci_op_rsp_packet(ndev, opcode, skb, ndev->ops->core_ops,
1337 ndev->ops->n_core_ops); 1337 ndev->ops->n_core_ops);
1338} 1338}
1339 1339
1340inline int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode, 1340int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,
1341 struct sk_buff *skb) 1341 struct sk_buff *skb)
1342{ 1342{
1343 return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->core_ops, 1343 return nci_op_ntf_packet(ndev, opcode, skb, ndev->ops->core_ops,
1344 ndev->ops->n_core_ops); 1344 ndev->ops->n_core_ops);