Skip to content

Commit 8b5fdfc

Browse files
wolfgang huangdavem330
authored andcommitted
mISDN: change function names to avoid conflicts
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 <[email protected]> Reported-by: k2ci <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 79b69a8 commit 8b5fdfc

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

drivers/isdn/mISDN/core.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ mISDNInit(void)
381381
err = mISDN_inittimer(&debug);
382382
if (err)
383383
goto error2;
384-
err = l1_init(&debug);
384+
err = Isdnl1_Init(&debug);
385385
if (err)
386386
goto error3;
387387
err = Isdnl2_Init(&debug);
@@ -395,7 +395,7 @@ mISDNInit(void)
395395
error5:
396396
Isdnl2_cleanup();
397397
error4:
398-
l1_cleanup();
398+
Isdnl1_cleanup();
399399
error3:
400400
mISDN_timer_cleanup();
401401
error2:
@@ -408,7 +408,7 @@ static void mISDN_cleanup(void)
408408
{
409409
misdn_sock_cleanup();
410410
Isdnl2_cleanup();
411-
l1_cleanup();
411+
Isdnl1_cleanup();
412412
mISDN_timer_cleanup();
413413
class_unregister(&mISDN_class);
414414

drivers/isdn/mISDN/core.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ struct Bprotocol *get_Bprotocol4id(u_int);
6060
extern int mISDN_inittimer(u_int *);
6161
extern void mISDN_timer_cleanup(void);
6262

63-
extern int l1_init(u_int *);
64-
extern void l1_cleanup(void);
63+
extern int Isdnl1_Init(u_int *);
64+
extern void Isdnl1_cleanup(void);
6565
extern int Isdnl2_Init(u_int *);
6666
extern void Isdnl2_cleanup(void);
6767

drivers/isdn/mISDN/layer1.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ create_l1(struct dchannel *dch, dchannel_l1callback *dcb) {
398398
EXPORT_SYMBOL(create_l1);
399399

400400
int
401-
l1_init(u_int *deb)
401+
Isdnl1_Init(u_int *deb)
402402
{
403403
debug = deb;
404404
l1fsm_s.state_count = L1S_STATE_COUNT;
@@ -409,7 +409,7 @@ l1_init(u_int *deb)
409409
}
410410

411411
void
412-
l1_cleanup(void)
412+
Isdnl1_cleanup(void)
413413
{
414414
mISDN_FsmFree(&l1fsm_s);
415415
}

0 commit comments

Comments
 (0)