[PATCH] W1: cleanups

Nice cleanup spotted by Adrian Bunk, which was lost due to moving to the
completely new functionality.

Shame-shame-shame on me.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --cc drivers/w1/w1.c
Simple merge

diff --cc drivers/w1/w1.h
Simple merge

diff --cc drivers/w1/w1_int.c
Simple merge