Commit d7398892 authored by hartleys's avatar hartleys Committed by David S. Miller
Browse files

isdn/eicon: use standard __init,__exit function markup 



Remove the custom DIVA_{INIT,EXIT}_FUNCTION defines and use
the standard __init,__exit markup.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Armin Schindler <mac@melware.de>
Cc: Karsten Keil <isdn@linux-pingi.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 67469601

drivers/isdn/hardware/eicon/capifunc.c

+3 −3
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ int fax_head_line_time(char *buffer) 
/*

 * init (alloc) main structures

 */

static int DIVA_INIT_FUNCTION init_main_structs(void)

static int __init init_main_structs(void)

{

	if (!(mapped_msg = (CAPI_MSG *) diva_os_malloc(0, MAX_MSG_SIZE))) {

		DBG_ERR(("init: failed alloc mapped_msg."))
@@ -1181,7 +1181,7 @@ static void do_api_remove_start(void) 
/*

 * init

 */

int DIVA_INIT_FUNCTION init_capifunc(void)

int __init init_capifunc(void)

{

	diva_os_initialize_spin_lock(&api_lock, "capifunc");

	memset(ControllerMap, 0, MAX_DESCRIPTORS + 1);
@@ -1209,7 +1209,7 @@ int DIVA_INIT_FUNCTION init_capifunc(void) 
/*

 * finit

 */

void DIVA_EXIT_FUNCTION finit_capifunc(void)

void __exit finit_capifunc(void)

{

	do_api_remove_start();

	divacapi_disconnect_didd();

drivers/isdn/hardware/eicon/capimain.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ void diva_os_set_controller_struct(struct capi_ctr *ctrl) 
/*

 * module init

 */

static int DIVA_INIT_FUNCTION divacapi_init(void)

static int __init divacapi_init(void)

{

	char tmprev[32];

	int ret = 0;
@@ -144,7 +144,7 @@ static int DIVA_INIT_FUNCTION divacapi_init(void) 
/*

 * module exit

 */

static void DIVA_EXIT_FUNCTION divacapi_exit(void)

static void __exit divacapi_exit(void)

{

	finit_capifunc();

	printk(KERN_INFO "%s: module unloaded.\n", DRIVERLNAME);

drivers/isdn/hardware/eicon/diddfunc.c

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ static void *didd_callback(void *context, DESCRIPTOR *adapter, 
/*

 * connect to didd

 */

static int DIVA_INIT_FUNCTION connect_didd(void)

static int __init connect_didd(void)

{

	int x = 0;

	int dadapter = 0;
@@ -79,7 +79,7 @@ static int DIVA_INIT_FUNCTION connect_didd(void) 
/*

 * disconnect from didd

 */

static void DIVA_EXIT_FUNCTION disconnect_didd(void)

static void __exit disconnect_didd(void)

{

	IDI_SYNC_REQ req;
@@ -92,7 +92,7 @@ static void DIVA_EXIT_FUNCTION disconnect_didd(void) 
/*

 * init

 */

int DIVA_INIT_FUNCTION diddfunc_init(void)

int __init diddfunc_init(void)

{

	diva_didd_load_time_init();
@@ -107,7 +107,7 @@ int DIVA_INIT_FUNCTION diddfunc_init(void) 
/*

 * finit

 */

void DIVA_EXIT_FUNCTION diddfunc_finit(void)

void __exit diddfunc_finit(void)

{

	DbgDeregister();

	disconnect_didd();

drivers/isdn/hardware/eicon/diva_didd.c

+3 −3
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static const struct file_operations divadidd_proc_fops = { 
	.release	= single_release,

};



static int DIVA_INIT_FUNCTION create_proc(void)

static int __init create_proc(void)

{

	proc_net_eicon = proc_mkdir("eicon", init_net.proc_net);
@@ -109,7 +109,7 @@ static void remove_proc(void) 
	remove_proc_entry("eicon", init_net.proc_net);

}



static int DIVA_INIT_FUNCTION divadidd_init(void)

static int __init divadidd_init(void)

{

	char tmprev[32];

	int ret = 0;
@@ -141,7 +141,7 @@ out: 
	return (ret);

}



static void DIVA_EXIT_FUNCTION divadidd_exit(void)

static void __exit divadidd_exit(void)

{

	diddfunc_finit();

	remove_proc();

drivers/isdn/hardware/eicon/divamnt.c

+3 −3
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void divas_maint_unregister_chrdev(void) 
	unregister_chrdev(major, DEVNAME);

}



static int DIVA_INIT_FUNCTION divas_maint_register_chrdev(void)

static int __init divas_maint_register_chrdev(void)

{

	if ((major = register_chrdev(0, DEVNAME, &divas_maint_fops)) < 0)

	{
@@ -207,7 +207,7 @@ void diva_maint_wakeup_read(void) 
/*

 *  Driver Load

 */

static int DIVA_INIT_FUNCTION maint_init(void)

static int __init maint_init(void)

{

	char tmprev[50];

	int ret = 0;
@@ -245,7 +245,7 @@ out: 
/*

**  Driver Unload

*/

static void DIVA_EXIT_FUNCTION maint_exit(void)

static void __exit maint_exit(void)

{

	divas_maint_unregister_chrdev();

	mntfunc_finit();

CRA Git | Maintained and supported by SUSTech CRA and CCSE