Commit 9d0094de authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by Linus Torvalds
Browse files

[PATCH] w1: Use ARRAY_SIZE macro when appropriate 



A patch to use ARRAY_SIZE macro already defined in kernel.h

Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Acked-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3f050447

drivers/w1/slaves/w1_therm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -141,7 +141,7 @@ static inline int w1_convert_temp(u8 rom[9], u8 fid) 
{

{

	int i;

	int i;





	for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)

	for (i = 0; i < ARRAY_SIZE(w1_therm_families); ++i)

		if (w1_therm_families[i].f->fid == fid)

		if (w1_therm_families[i].f->fid == fid)

			return w1_therm_families[i].convert(rom);

			return w1_therm_families[i].convert(rom);
@@ -238,7 +238,7 @@ static int __init w1_therm_init(void) 
{

{

	int err, i;

	int err, i;





	for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i) {

	for (i = 0; i < ARRAY_SIZE(w1_therm_families); ++i) {

		err = w1_register_family(w1_therm_families[i].f);

		err = w1_register_family(w1_therm_families[i].f);

		if (err)

		if (err)

			w1_therm_families[i].broken = 1;

			w1_therm_families[i].broken = 1;
@@ -251,7 +251,7 @@ static void __exit w1_therm_fini(void) 
{

{

	int i;

	int i;





	for (i=0; i<sizeof(w1_therm_families)/sizeof(w1_therm_families[0]); ++i)

	for (i = 0; i < ARRAY_SIZE(w1_therm_families); ++i)

		if (!w1_therm_families[i].broken)

		if (!w1_therm_families[i].broken)

			w1_unregister_family(w1_therm_families[i].f);

			w1_unregister_family(w1_therm_families[i].f);

}

}