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

Commit f1163174 authored by Robert Dolca's avatar Robert Dolca Committed by Samuel Ortiz
Browse files

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: default avatarRobert Dolca <robert.dolca@intel.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent d8e018c0

include/net/nfc/nci_core.h

+4 −4
Original line number Diff line number Diff line
@@ -352,13 +352,13 @@ static inline int nci_set_vendor_cmds(struct nci_dev *ndev, 


void nci_rsp_packet(struct nci_dev *ndev, struct sk_buff *skb);

void nci_ntf_packet(struct nci_dev *ndev, struct sk_buff *skb);

inline int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,

int nci_prop_rsp_packet(struct nci_dev *ndev, __u16 opcode,

			struct sk_buff *skb);

inline int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,

int nci_prop_ntf_packet(struct nci_dev *ndev, __u16 opcode,

			struct sk_buff *skb);

inline int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,

int nci_core_rsp_packet(struct nci_dev *ndev, __u16 opcode,

			struct sk_buff *skb);

inline int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,

int nci_core_ntf_packet(struct nci_dev *ndev, __u16 opcode,

			struct sk_buff *skb);

void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb);

int nci_send_cmd(struct nci_dev *ndev, __u16 opcode, __u8 plen, void *payload);

net/nfc/nci/core.c

+8 −8
Original line number Diff line number Diff line
@@ -1316,28 +1316,28 @@ 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,

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,

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,

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,

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,