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

Commit e70a9c66 authored by wolfgang huang's avatar wolfgang huang Committed by Greg Kroah-Hartman
Browse files

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: default avatarwolfgang huang <huangjinhui@kylinos.cn>
Reported-by: default avatark2ci <kernel-bot@kylinos.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a08b8a60

drivers/isdn/mISDN/core.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/isdn/mISDN/core.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/isdn/mISDN/layer1.c

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -418,7 +418,7 @@ l1_init(u_int *deb) 
}



void

l1_cleanup(void)

Isdnl1_cleanup(void)

{

	mISDN_FsmFree(&l1fsm_s);

}