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

Commit 939fc832 authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Linus Torvalds
Browse files

w1: add helper macro module_w1_family 

The helper macro module_w1_family can be used in module drivers that
only register a w1 driver in their module init functions.  Add this
macro and use it in all applicable drivers.

Link: http://lkml.kernel.org/r/20160531204313.20979-2-afd@ti.com


Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 098f9fb0

drivers/w1/slaves/w1_ds2406.c

+1 −13
Original line number Diff line number Diff line
@@ -153,16 +153,4 @@ static struct w1_family w1_family_12 = { 
	.fid = W1_FAMILY_DS2406,

	.fops = &w1_f12_fops,

};



static int __init w1_f12_init(void)

{

	return w1_register_family(&w1_family_12);

}



static void __exit w1_f12_exit(void)

{

	w1_unregister_family(&w1_family_12);

}



module_init(w1_f12_init);

module_exit(w1_f12_exit);
 
module_w1_family(w1_family_12);

drivers/w1/slaves/w1_ds2408.c

+1 −13
Original line number Diff line number Diff line
@@ -351,16 +351,4 @@ static struct w1_family w1_family_29 = { 
	.fid = W1_FAMILY_DS2408,

	.fops = &w1_f29_fops,

};



static int __init w1_f29_init(void)

{

	return w1_register_family(&w1_family_29);

}



static void __exit w1_f29_exit(void)

{

	w1_unregister_family(&w1_family_29);

}



module_init(w1_f29_init);

module_exit(w1_f29_exit);
 
module_w1_family(w1_family_29);

drivers/w1/slaves/w1_ds2413.c

+1 −13
Original line number Diff line number Diff line
@@ -135,16 +135,4 @@ static struct w1_family w1_family_3a = { 
	.fid = W1_FAMILY_DS2413,

	.fops = &w1_f3a_fops,

};



static int __init w1_f3a_init(void)

{

	return w1_register_family(&w1_family_3a);

}



static void __exit w1_f3a_exit(void)

{

	w1_unregister_family(&w1_family_3a);

}



module_init(w1_f3a_init);

module_exit(w1_f3a_exit);
 
module_w1_family(w1_family_3a);

drivers/w1/slaves/w1_ds2423.c

+1 −13
Original line number Diff line number Diff line
@@ -138,19 +138,7 @@ static struct w1_family w1_family_1d = { 
	.fid = W1_COUNTER_DS2423,

	.fops = &w1_f1d_fops,

};



static int __init w1_f1d_init(void)

{

	return w1_register_family(&w1_family_1d);

}



static void __exit w1_f1d_exit(void)

{

	w1_unregister_family(&w1_family_1d);

}



module_init(w1_f1d_init);

module_exit(w1_f1d_exit);

module_w1_family(w1_family_1d);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Mika Laitio <lamikr@pilppa.org>");

drivers/w1/slaves/w1_ds2431.c

+1 −13
Original line number Diff line number Diff line
@@ -288,19 +288,7 @@ static struct w1_family w1_family_2d = { 
	.fid = W1_EEPROM_DS2431,

	.fops = &w1_f2d_fops,

};



static int __init w1_f2d_init(void)

{

	return w1_register_family(&w1_family_2d);

}



static void __exit w1_f2d_fini(void)

{

	w1_unregister_family(&w1_family_2d);

}



module_init(w1_f2d_init);

module_exit(w1_f2d_fini);

module_w1_family(w1_family_2d);



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Bernhard Weirich <bernhard.weirich@riedel.net>");