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

Commit de0d6dbd authored by Andrew F. Davis's avatar Andrew F. Davis Committed by Greg Kroah-Hartman
Browse files

w1: Add subsystem kernel public interface 



Like other subsystems we should be able to define slave devices outside
of the w1 directory. To do this we move public facing interface
definitions to include/linux/w1.h and rename the internal definition
file to w1_internal.h.

As w1_family.h and w1_int.h contained almost entirely public
driver interface definitions we simply removed these files and
moved the remaining definitions into w1_internal.h.

With this we can now start to move slave devices out of w1/slaves and
into the subsystem based on the function they implement, again like
other drivers.

Signed-off-by: default avatarAndrew F. Davis <afd@ti.com>
Reviewed-by: default avatarSebastian Reichel <sre@kernel.org>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent acb7e8f7

MAINTAINERS

+1 −0
Original line number Original line Diff line number Diff line
@@ -13790,6 +13790,7 @@ M: Evgeniy Polyakov <zbr@ioremap.net> 
S:	Maintained

S:	Maintained

F:	Documentation/w1/

F:	Documentation/w1/

F:	drivers/w1/

F:	drivers/w1/

F:	include/linux/w1.h





W83791D HARDWARE MONITORING DRIVER

W83791D HARDWARE MONITORING DRIVER

M:	Marc Hulsman <m.hulsman@tudelft.nl>

M:	Marc Hulsman <m.hulsman@tudelft.nl>

drivers/power/supply/ds2760_battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/power_supply.h>





#include "../../w1/w1.h"

#include <linux/w1.h>

#include "../../w1/slaves/w1_ds2760.h"

#include "../../w1/slaves/w1_ds2760.h"





struct ds2760_device_info {

struct ds2760_device_info {

drivers/power/supply/ds2780_battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <linux/power_supply.h>

#include <linux/power_supply.h>

#include <linux/idr.h>

#include <linux/idr.h>





#include "../../w1/w1.h"

#include <linux/w1.h>

#include "../../w1/slaves/w1_ds2780.h"

#include "../../w1/slaves/w1_ds2780.h"





/* Current unit measurement in uA for a 1 milli-ohm sense resistor */

/* Current unit measurement in uA for a 1 milli-ohm sense resistor */

drivers/power/supply/ds2781_battery.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/power_supply.h>

#include <linux/power_supply.h>

#include <linux/idr.h>

#include <linux/idr.h>





#include "../../w1/w1.h"

#include <linux/w1.h>

#include "../../w1/slaves/w1_ds2781.h"

#include "../../w1/slaves/w1_ds2781.h"





/* Current unit measurement in uA for a 1 milli-ohm sense resistor */

/* Current unit measurement in uA for a 1 milli-ohm sense resistor */

drivers/w1/masters/ds1wm.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -25,8 +25,7 @@ 




#include <asm/io.h>

#include <asm/io.h>





#include "../w1.h"

#include <linux/w1.h>

#include "../w1_int.h"









#define DS1WM_CMD	0x00	/* R/W 4 bits command */

#define DS1WM_CMD	0x00	/* R/W 4 bits command */