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

Commit 46e07f6e authored by Evgeniy Polyakov's avatar Evgeniy Polyakov Committed by Greg Kroah-Hartman
Browse files

[PATCH] w1: Make w1 connector notifications depend on connector. 



Make w1 connector notifications depend on connector.

Signed-off-by: default avatarEvgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent bb5427b5

drivers/w1/Kconfig

+13 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ menu "Dallas's 1-wire bus" 
config W1

	tristate "Dallas's 1-wire support"

	---help---

	  Dallas's 1-wire bus is useful to connect slow 1-pin devices

	  Dallas' 1-wire bus is useful to connect slow 1-pin devices

	  such as iButtons and thermal sensors.



	  If you want W1 support, you should say Y here.
@@ -11,6 +11,18 @@ config W1 
	  This W1 support can also be built as a module.  If so, the module

	  will be called wire.ko.



config W1_CON

	depends on CONNECTOR

	bool "Userspace communication over connector"

	default y

	--- help ---

	  This allows to communicate with userspace using connector [Documentation/connector].

	  There are three types of messages between w1 core and userspace:

	  1. Events. They are generated each time new master or slave device found

		either due to automatic or requested search.

	  2. Userspace commands. Includes read/write and search/alarm search comamnds.

	  3. Replies to userspace commands.



source drivers/w1/masters/Kconfig

source drivers/w1/slaves/Kconfig

drivers/w1/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -2,10 +2,6 @@ 
# Makefile for the Dallas's 1-wire bus.

#



ifeq ($(CONFIG_CONNECTOR), n)

EXTRA_CFLAGS	+= -DNETLINK_DISABLED

endif



ifeq ($(CONFIG_W1_DS2433_CRC), y)

EXTRA_CFLAGS	+= -DCONFIG_W1_F23_CRC

endif

drivers/w1/w1_netlink.c

+1 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "w1_log.h"

#include "w1_netlink.h"



#ifndef NETLINK_DISABLED

#if defined(CONFIG_W1_CON) && (defined(CONFIG_CONNECTOR) || (defined(CONFIG_CONNECTOR_MODULE) && defined(CONFIG_W1_MODULE)))

void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)

{

	char buf[sizeof(struct cn_msg) + sizeof(struct w1_netlink_msg)];
@@ -230,8 +230,6 @@ void w1_fini_netlink(void) 
	cn_del_callback(&w1_id);

}

#else

#warning Netlink support is disabled. Please compile with NET support enabled.



void w1_netlink_send(struct w1_master *dev, struct w1_netlink_msg *msg)

{

}