Skip to content

Commit de0d6db

Browse files
glneogregkh
glneo
authored and
gregkh
committed
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: Andrew F. Davis <afd@ti.com> Reviewed-by: Sebastian Reichel <sre@kernel.org> Acked-by: Evgeniy Polyakov <zbr@ioremap.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent acb7e8f commit de0d6db

36 files changed

+208
-260
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13790,6 +13790,7 @@ M: Evgeniy Polyakov <zbr@ioremap.net>
1379013790
S: Maintained
1379113791
F: Documentation/w1/
1379213792
F: drivers/w1/
13793+
F: include/linux/w1.h
1379313794

1379413795
W83791D HARDWARE MONITORING DRIVER
1379513796
M: Marc Hulsman <m.hulsman@tudelft.nl>

‎drivers/power/supply/ds2760_battery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <linux/platform_device.h>
2929
#include <linux/power_supply.h>
3030

31-
#include "../../w1/w1.h"
31+
#include <linux/w1.h>
3232
#include "../../w1/slaves/w1_ds2760.h"
3333

3434
struct ds2760_device_info {

‎drivers/power/supply/ds2780_battery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/power_supply.h>
2222
#include <linux/idr.h>
2323

24-
#include "../../w1/w1.h"
24+
#include <linux/w1.h>
2525
#include "../../w1/slaves/w1_ds2780.h"
2626

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

‎drivers/power/supply/ds2781_battery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <linux/power_supply.h>
2020
#include <linux/idr.h>
2121

22-
#include "../../w1/w1.h"
22+
#include <linux/w1.h>
2323
#include "../../w1/slaves/w1_ds2781.h"
2424

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

‎drivers/w1/masters/ds1wm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525

2626
#include <asm/io.h>
2727

28-
#include "../w1.h"
29-
#include "../w1_int.h"
28+
#include <linux/w1.h>
3029

3130

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

‎drivers/w1/masters/ds2482.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
#include <linux/delay.h>
2121
#include <asm/delay.h>
2222

23-
#include "../w1.h"
24-
#include "../w1_int.h"
23+
#include <linux/w1.h>
2524

2625
/**
2726
* Allow the active pullup to be disabled, default is enabled.

‎drivers/w1/masters/ds2490.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
#include <linux/usb.h>
2626
#include <linux/slab.h>
2727

28-
#include "../w1_int.h"
29-
#include "../w1.h"
28+
#include <linux/w1.h>
3029

3130
/* USB Standard */
3231
/* USB Control request vendor type */

‎drivers/w1/masters/matrox_w1.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@
3434
#include <linux/pci_ids.h>
3535
#include <linux/pci.h>
3636

37-
#include "../w1.h"
38-
#include "../w1_int.h"
37+
#include <linux/w1.h>
3938

4039
/*
4140
* Matrox G400 DDC registers.

‎drivers/w1/masters/mxc_w1.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
#include <linux/module.h>
2020
#include <linux/platform_device.h>
2121

22-
#include "../w1.h"
23-
#include "../w1_int.h"
22+
#include <linux/w1.h>
2423

2524
/*
2625
* MXC W1 Register offsets

‎drivers/w1/masters/omap_hdq.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@
1919
#include <linux/pm_runtime.h>
2020
#include <linux/of.h>
2121

22-
#include "../w1.h"
23-
#include "../w1_int.h"
22+
#include <linux/w1.h>
2423

2524
#define MOD_NAME "OMAP_HDQ:"
2625

‎drivers/w1/masters/w1-gpio.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@
2020
#include <linux/of.h>
2121
#include <linux/delay.h>
2222

23-
#include "../w1.h"
24-
#include "../w1_int.h"
23+
#include <linux/w1.h>
2524

2625
static u8 w1_gpio_set_pullup(void *data, int delay)
2726
{

‎drivers/w1/slaves/w1_bq27000.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <linux/mutex.h>
1818
#include <linux/power/bq27xxx_battery.h>
1919

20-
#include "../w1.h"
21-
#include "../w1_int.h"
22-
#include "../w1_family.h"
20+
#include <linux/w1.h>
21+
22+
#define W1_FAMILY_BQ27000 0x01
2323

2424
#define HDQ_CMD_READ (0)
2525
#define HDQ_CMD_WRITE (1<<7)

‎drivers/w1/slaves/w1_ds2405.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@
2424
#include <linux/string.h>
2525
#include <linux/types.h>
2626

27-
#include "../w1.h"
28-
#include "../w1_family.h"
27+
#include <linux/w1.h>
28+
29+
#define W1_FAMILY_DS2405 0x05
2930

3031
MODULE_LICENSE("GPL");
3132
MODULE_AUTHOR("Maciej S. Szmigiero <mail@maciej.szmigiero.name>");

‎drivers/w1/slaves/w1_ds2406.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
#include <linux/slab.h>
1818
#include <linux/crc16.h>
1919

20-
#include "../w1.h"
21-
#include "../w1_int.h"
22-
#include "../w1_family.h"
20+
#include <linux/w1.h>
21+
22+
#define W1_FAMILY_DS2406 0x12
2323

2424
#define W1_F12_FUNC_READ_STATUS 0xAA
2525
#define W1_F12_FUNC_WRITE_STATUS 0x55

‎drivers/w1/slaves/w1_ds2408.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
#include <linux/delay.h>
1616
#include <linux/slab.h>
1717

18-
#include "../w1.h"
19-
#include "../w1_int.h"
20-
#include "../w1_family.h"
18+
#include <linux/w1.h>
19+
20+
#define W1_FAMILY_DS2408 0x29
2121

2222
#define W1_F29_RETRIES 3
2323

‎drivers/w1/slaves/w1_ds2413.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/delay.h>
1717
#include <linux/slab.h>
1818

19-
#include "../w1.h"
20-
#include "../w1_int.h"
21-
#include "../w1_family.h"
19+
#include <linux/w1.h>
20+
21+
#define W1_FAMILY_DS2413 0x3A
2222

2323
#define W1_F3A_RETRIES 3
2424
#define W1_F3A_FUNC_PIO_ACCESS_READ 0xF5

‎drivers/w1/slaves/w1_ds2423.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
#include <linux/delay.h>
3131
#include <linux/crc16.h>
3232

33-
#include "../w1.h"
34-
#include "../w1_int.h"
35-
#include "../w1_family.h"
33+
#include <linux/w1.h>
34+
35+
#define W1_COUNTER_DS2423 0x1D
3636

3737
#define CRC16_VALID 0xb001
3838
#define CRC16_INIT 0

‎drivers/w1/slaves/w1_ds2431.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
#include <linux/types.h>
1717
#include <linux/delay.h>
1818

19-
#include "../w1.h"
20-
#include "../w1_int.h"
21-
#include "../w1_family.h"
19+
#include <linux/w1.h>
20+
21+
#define W1_EEPROM_DS2431 0x2D
2222

2323
#define W1_F2D_EEPROM_SIZE 128
2424
#define W1_F2D_PAGE_COUNT 4

‎drivers/w1/slaves/w1_ds2433.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
#endif
2424

25-
#include "../w1.h"
26-
#include "../w1_int.h"
27-
#include "../w1_family.h"
25+
#include <linux/w1.h>
26+
27+
#define W1_EEPROM_DS2433 0x23
2828

2929
#define W1_EEPROM_SIZE 512
3030
#define W1_PAGE_COUNT 16

‎drivers/w1/slaves/w1_ds2438.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
#include <linux/types.h>
1414
#include <linux/delay.h>
1515

16-
#include "../w1.h"
17-
#include "../w1_family.h"
16+
#include <linux/w1.h>
17+
18+
#define W1_FAMILY_DS2438 0x26
1819

1920
#define W1_DS2438_RETRIES 3
2021

‎drivers/w1/slaves/w1_ds2760.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
#include <linux/idr.h>
1919
#include <linux/gfp.h>
2020

21-
#include "../w1.h"
22-
#include "../w1_int.h"
23-
#include "../w1_family.h"
21+
#include <linux/w1.h>
22+
2423
#include "w1_ds2760.h"
2524

25+
#define W1_FAMILY_DS2760 0x30
26+
2627
static int w1_ds2760_io(struct device *dev, char *buf, int addr, size_t count,
2728
int io)
2829
{

‎drivers/w1/slaves/w1_ds2780.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@
2121
#include <linux/mutex.h>
2222
#include <linux/idr.h>
2323

24-
#include "../w1.h"
25-
#include "../w1_int.h"
26-
#include "../w1_family.h"
24+
#include <linux/w1.h>
25+
2726
#include "w1_ds2780.h"
2827

28+
#define W1_FAMILY_DS2780 0x32
29+
2930
static int w1_ds2780_do_io(struct device *dev, char *buf, int addr,
3031
size_t count, int io)
3132
{

‎drivers/w1/slaves/w1_ds2781.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
#include <linux/platform_device.h>
1919
#include <linux/mutex.h>
2020

21-
#include "../w1.h"
22-
#include "../w1_int.h"
23-
#include "../w1_family.h"
21+
#include <linux/w1.h>
22+
2423
#include "w1_ds2781.h"
2524

25+
#define W1_FAMILY_DS2781 0x3D
26+
2627
static int w1_ds2781_do_io(struct device *dev, char *buf, int addr,
2728
size_t count, int io)
2829
{

‎drivers/w1/slaves/w1_ds28e04.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#define CRC16_INIT 0
2121
#define CRC16_VALID 0xb001
2222

23-
#include "../w1.h"
24-
#include "../w1_int.h"
25-
#include "../w1_family.h"
23+
#include <linux/w1.h>
24+
25+
#define W1_FAMILY_DS28E04 0x1C
2626

2727
/* Allow the strong pullup to be disabled, but default to enabled.
2828
* If it was disabled a parasite powered device might not get the required

‎drivers/w1/slaves/w1_smem.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@
2727
#include <linux/device.h>
2828
#include <linux/types.h>
2929

30-
#include "../w1.h"
31-
#include "../w1_int.h"
32-
#include "../w1_family.h"
30+
#include <linux/w1.h>
31+
32+
#define W1_FAMILY_SMEM_01 0x01
33+
#define W1_FAMILY_SMEM_81 0x81
3334

3435
static struct w1_family w1_smem_family_01 = {
3536
.fid = W1_FAMILY_SMEM_01,

‎drivers/w1/slaves/w1_therm.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,13 @@
3030
#include <linux/slab.h>
3131
#include <linux/delay.h>
3232

33-
#include "../w1.h"
34-
#include "../w1_int.h"
35-
#include "../w1_family.h"
33+
#include <linux/w1.h>
34+
35+
#define W1_THERM_DS18S20 0x10
36+
#define W1_THERM_DS1822 0x22
37+
#define W1_THERM_DS18B20 0x28
38+
#define W1_THERM_DS1825 0x3B
39+
#define W1_THERM_DS28EA00 0x42
3640

3741
/* Allow the strong pullup to be disabled, but default to enabled.
3842
* If it was disabled a parasite powered device might not get the require

‎drivers/w1/w1.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828

2929
#include <linux/atomic.h>
3030

31-
#include "w1.h"
32-
#include "w1_int.h"
33-
#include "w1_family.h"
31+
#include "w1_internal.h"
3432
#include "w1_netlink.h"
3533

34+
#define W1_FAMILY_DEFAULT 0
35+
3636
static int w1_timeout = 10;
3737
module_param_named(timeout, w1_timeout, int, 0);
3838
MODULE_PARM_DESC(timeout, "time in seconds between automatic slave searches");

‎drivers/w1/w1_family.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
#include <linux/delay.h>
1919
#include <linux/export.h>
2020

21-
#include "w1_family.h"
22-
#include "w1.h"
21+
#include "w1_internal.h"
2322

2423
DEFINE_SPINLOCK(w1_flock);
2524
static LIST_HEAD(w1_families);

0 commit comments

Comments
 (0)