summaryrefslogtreecommitdiffstats
path: root/net/nfc/hci
diff options
context:
space:
mode:
authorEric Lapuyade <eric.lapuyade@linux.intel.com>2012-09-18 19:24:37 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-09-25 00:17:26 +0200
commita7d0281bbf7e1b0eff2de3c7ed6a5ffce6b62dac (patch)
tree28d91849f11713d67154d6dd183a1131dfd90e07 /net/nfc/hci
parentNFC: Move the pn544_hci dereference below the NULL test (diff)
downloadlinux-a7d0281bbf7e1b0eff2de3c7ed6a5ffce6b62dac.tar.xz
linux-a7d0281bbf7e1b0eff2de3c7ed6a5ffce6b62dac.zip
NFC: Fix LLC registration definitions for ANSI compliance
Signed-off-by: Eric Lapuyade <eric.lapuyade@intel.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'net/nfc/hci')
-rw-r--r--net/nfc/hci/llc_nop.c2
-rw-r--r--net/nfc/hci/llc_shdlc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/nfc/hci/llc_nop.c b/net/nfc/hci/llc_nop.c
index d91dd66a082d..87b10291b40f 100644
--- a/net/nfc/hci/llc_nop.c
+++ b/net/nfc/hci/llc_nop.c
@@ -93,7 +93,7 @@ static struct nfc_llc_ops llc_nop_ops = {
.xmit_from_hci = llc_nop_xmit_from_hci,
};
-int nfc_llc_nop_register()
+int nfc_llc_nop_register(void)
{
return nfc_llc_register(LLC_NOP_NAME, &llc_nop_ops);
}
diff --git a/net/nfc/hci/llc_shdlc.c b/net/nfc/hci/llc_shdlc.c
index 3761c7490a61..d54bfc51c693 100644
--- a/net/nfc/hci/llc_shdlc.c
+++ b/net/nfc/hci/llc_shdlc.c
@@ -826,7 +826,7 @@ static struct nfc_llc_ops llc_shdlc_ops = {
.xmit_from_hci = llc_shdlc_xmit_from_hci,
};
-int nfc_llc_shdlc_register()
+int nfc_llc_shdlc_register(void)
{
return nfc_llc_register(LLC_SHDLC_NAME, &llc_shdlc_ops);
}