mISDN: change function names to avoid conflicts

[ Upstream commit 8b5fdfc57cc2471179d1c51081424ded833c16c8 ]

As we build for mips, we meet following error. l1_init error with
multiple definition. Some architecture devices usually marked with
l1, l2, lxx as the start-up phase. so we change the mISDN function
names, align with Isdnl2_xxx.

mips-linux-gnu-ld: drivers/isdn/mISDN/layer1.o: in function `l1_init':
(.text+0x890): multiple definition of `l1_init'; \
arch/mips/kernel/bmips_5xxx_init.o:(.text+0xf0): first defined here
make[1]: *** [home/mips/kernel-build/linux/Makefile:1161: vmlinux] Error 1

Signed-off-by: wolfgang huang <huangjinhui@kylinos.cn>
Reported-by: k2ci <kernel-bot@kylinos.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c
index faf505462a4f562e2aa15be65b5c5f9b564565ab..f5a06a6fb297f5807b4ce90e5afdb8f6994661c2 100644 (file)
--- a/drivers/isdn/mISDN/core.c
+++ b/drivers/isdn/mISDN/core.c
@@ -390,7 +390,7 @@ mISDNInit(void)
        err = mISDN_inittimer(&debug);
        if (err)
                goto error2;
-       err = l1_init(&debug);
+       err = Isdnl1_Init(&debug);
        if (err)
                goto error3;
        err = Isdnl2_Init(&debug);
@@ -404,7 +404,7 @@ mISDNInit(void)
 error5:
        Isdnl2_cleanup();
 error4:
-       l1_cleanup();
+       Isdnl1_cleanup();
 error3:
        mISDN_timer_cleanup();
 error2:
@@ -417,7 +417,7 @@ static void mISDN_cleanup(void)
 {
        misdn_sock_cleanup();
        Isdnl2_cleanup();
-       l1_cleanup();
+       Isdnl1_cleanup();
        mISDN_timer_cleanup();
        class_unregister(&mISDN_class);
 

diff --git a/drivers/isdn/mISDN/core.h b/drivers/isdn/mISDN/core.h
index 52695bb81ee7a80721fb22d76980d85300096f03..3c039b6ade2e1a249c48d3c2e072836ee5f2fda0 100644 (file)
--- a/drivers/isdn/mISDN/core.h
+++ b/drivers/isdn/mISDN/core.h
@@ -69,8 +69,8 @@ struct Bprotocol      *get_Bprotocol4id(u_int);
 extern int     mISDN_inittimer(u_int *);
 extern void    mISDN_timer_cleanup(void);
 
-extern int     l1_init(u_int *);
-extern void    l1_cleanup(void);
+extern int     Isdnl1_Init(u_int *);
+extern void    Isdnl1_cleanup(void);
 extern int     Isdnl2_Init(u_int *);
 extern void    Isdnl2_cleanup(void);
 

diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c
index bebc57b72138e721aa5a290482ae46e748aac2d2..94d7cc58da648e30a490486e9f4613bfc002b1c5 100644 (file)
--- a/drivers/isdn/mISDN/layer1.c
+++ b/drivers/isdn/mISDN/layer1.c
@@ -407,7 +407,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) {
 EXPORT_SYMBOL(create_l1);
 
 int
-l1_init(u_int *deb)
+Isdnl1_Init(u_int *deb)
 {
        debug = deb;
        l1fsm_s.state_count = L1S_STATE_COUNT;
@@ -419,7 +419,7 @@ l1_init(u_int *deb)
 }
 
 void
-l1_cleanup(void)
+Isdnl1_cleanup(void)
 {
        mISDN_FsmFree(&l1fsm_s);
 }