Cleanups for W1
cover Cleanups for W1
Hello all,
These are some format changes to make the w1 drivers and sub-system more modern looking. I know they are overly pedantic, but I like them and they don't make any functional changes so why not ¯\_(ツ)_/¯
Thanks,
Andrew
Andrew F. Davis (2):
w1: Fixup source file headers
w1: Organize driver source to natural/common order
drivers/w1/masters/ds2482.c | 45 ++++++++++++++------------------- drivers/w1/masters/ds2490.c | 33 ++++++++++-------------- drivers/w1/masters/matrox_w1.c | 40 +++++++++++++---------------- drivers/w1/masters/omap_hdq.c | 57 ++++++++++++++++++------------------------ drivers/w1/slaves/w1_bq27000.c | 9 +++---- drivers/w1/slaves/w1_ds2406.c | 8 +++--- drivers/w1/slaves/w1_ds2408.c | 11 ++++---- drivers/w1/slaves/w1_ds2413.c | 10 ++++---- drivers/w1/slaves/w1_ds2423.c | 2 +- drivers/w1/slaves/w1_ds2431.c | 2 +- drivers/w1/slaves/w1_ds2433.c | 10 ++++---- drivers/w1/slaves/w1_ds2760.c | 11 ++++---- drivers/w1/slaves/w1_ds2780.c | 2 +- drivers/w1/slaves/w1_ds2781.c | 2 +- drivers/w1/slaves/w1_ds28e04.c | 10 ++++---- drivers/w1/slaves/w1_smem.c | 12 ++++----- drivers/w1/slaves/w1_therm.c | 18 ++++++------- drivers/w1/w1.c | 25 ++++++++---------- drivers/w1/w1.h | 7 ------ drivers/w1/w1_family.c | 12 ++------- drivers/w1/w1_family.h | 7 ------ drivers/w1/w1_int.c | 10 +------- drivers/w1/w1_int.h | 7 ------ drivers/w1/w1_io.c | 7 ------ drivers/w1/w1_log.h | 7 ------ drivers/w1/w1_netlink.c | 7 ------ drivers/w1/w1_netlink.h | 7 ------ 27 files changed, 138 insertions(+), 240 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/2 w1: Fixup source file headers
Remove filename from file, this is not done anymore as it doesn't add anything and usually is incorrect as filename change often.
Also shorten the GPL to the more common address-less version and remove excess white-space.
Signed-off-by Andrew F. Davis <[email protected]>
--- drivers/w1/w1.c | 7 ------- drivers/w1/w1.h | 7 ------- drivers/w1/w1_family.c | 7 ------- drivers/w1/w1_family.h | 7 ------- drivers/w1/w1_int.c | 7 ------- drivers/w1/w1_int.h | 7 ------- drivers/w1/w1_io.c | 7 ------- drivers/w1/w1_log.h | 7 ------- drivers/w1/w1_netlink.c | 7 ------- drivers/w1/w1_netlink.h | 7 ------- 10 files changed, 70 deletions(-)
drivers/w1/w1.c +0 -7
@@ -1,9 +1,6 @@/* -* w1.c -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/delay.h>
drivers/w1/w1.h +0 -7
@@ -1,9 +1,6 @@/* -* w1.h -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W1_H
drivers/w1/w1_family.c +0 -7
@@ -1,9 +1,6 @@/* -* w1_family.c -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/spinlock.h>
drivers/w1/w1_family.h +0 -7
@@ -1,9 +1,6 @@/* -* w1_family.h -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W1_FAMILY_H
drivers/w1/w1_int.c +0 -7
@@ -1,9 +1,6 @@/* -* w1_int.c -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/kernel.h>
drivers/w1/w1_int.h +0 -7
@@ -1,9 +1,6 @@/* -* w1_int.h -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W1_INT_H
drivers/w1/w1_io.c +0 -7
@@ -1,9 +1,6 @@/* -* w1_io.c -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <asm/io.h>
drivers/w1/w1_log.h +0 -7
@@ -1,9 +1,6 @@/* -* w1_log.h -* * Copyright (c) 2004 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W1_LOG_H
drivers/w1/w1_netlink.c +0 -7
@@ -1,9 +1,6 @@/* -* w1_netlink.c -* * Copyright (c) 2003 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/slab.h>
drivers/w1/w1_netlink.h +0 -7
@@ -1,9 +1,6 @@/* -* w1_netlink.h -* * Copyright (c) 2003 Evgeniy Polyakov <[email protected]> * -* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or
@@ -13,10 +10,6 @@* but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #ifndef __W1_NETLINK_H
Signature · 1 line
2.11.0
PATCH 2/2 w1: Organize driver source to natural/common order
In reply to Andrew F. DavisStructures and functions should be ordered such that forward declaration use is minimized.
MODULE_* macros should immediately follow the structures and functions upon which they act.
Remaining MODULE_* macros should be at the end of the file in alphabetical order.
Signed-off-by Andrew F. Davis <[email protected]>
--- drivers/w1/masters/ds2482.c | 45 ++++++++++++++------------------- drivers/w1/masters/ds2490.c | 33 ++++++++++-------------- drivers/w1/masters/matrox_w1.c | 40 +++++++++++++---------------- drivers/w1/masters/omap_hdq.c | 57 ++++++++++++++++++------------------------ drivers/w1/slaves/w1_bq27000.c | 9 +++---- drivers/w1/slaves/w1_ds2406.c | 8 +++--- drivers/w1/slaves/w1_ds2408.c | 11 ++++---- drivers/w1/slaves/w1_ds2413.c | 10 ++++---- drivers/w1/slaves/w1_ds2423.c | 2 +- drivers/w1/slaves/w1_ds2431.c | 2 +- drivers/w1/slaves/w1_ds2433.c | 10 ++++---- drivers/w1/slaves/w1_ds2760.c | 11 ++++---- drivers/w1/slaves/w1_ds2780.c | 2 +- drivers/w1/slaves/w1_ds2781.c | 2 +- drivers/w1/slaves/w1_ds28e04.c | 10 ++++---- drivers/w1/slaves/w1_smem.c | 12 ++++----- drivers/w1/slaves/w1_therm.c | 18 ++++++------- drivers/w1/w1.c | 18 +++++++------ drivers/w1/w1_family.c | 5 ++-- drivers/w1/w1_int.c | 3 +-- 20 files changed, 138 insertions(+), 170 deletions(-)
drivers/w1/masters/ds2482.c +19 -26
@@ -35,6 +35,8 @@*/ static int ds2482_active_pullup =1 ;module_param_named (active_pullup, ds2482_active_pullup, int,0644 ); +MODULE_PARM_DESC (active_pullup,"Active pullup (apply to all buses): " \ +"0-disable, 1-enable (default)" );/** * The DS2482 registers - there are 3 registers that are addressed by a read
@@ -93,30 +95,6 @@ static const u8 ds2482_chan_rd[8] =#define DS2482_REG_STS_PPD 0x02#define DS2482_REG_STS_1WB 0x01 - -static int ds2482_probe (struct i2c_client *client, -const struct i2c_device_id *id); -static int ds2482_remove (struct i2c_client *client); - - -/** -* Driver data (common to all clients) -*/ -static const struct i2c_device_id ds2482_id[] = { - {"ds2482" ,0 }, - { } -}; -MODULE_DEVICE_TABLE (i2c, ds2482_id); - -static struct i2c_driver ds2482_driver = { - .driver = { - .name ="ds2482" , - }, - .probe = ds2482_probe, - .remove = ds2482_remove, - .id_table = ds2482_id, -}; -/* * Client data (each client gets its own) */
@@ -560,10 +538,25 @@ static int ds2482_remove(struct i2c_client *client)return 0 ; } +/** +* Driver data (common to all clients) +*/ +static const struct i2c_device_id ds2482_id[] = { + {"ds2482" ,0 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, ds2482_id); + +static struct i2c_driver ds2482_driver = { + .driver = { + .name ="ds2482" , + }, + .probe = ds2482_probe, + .remove = ds2482_remove, + .id_table = ds2482_id, +};module_i2c_driver (ds2482_driver); -MODULE_PARM_DESC (active_pullup,"Active pullup (apply to all buses): " \ -"0-disable, 1-enable (default)" );MODULE_AUTHOR ("Ben Gardner <[email protected]>" );MODULE_DESCRIPTION ("DS2482 driver" );MODULE_LICENSE ("GPL" );
drivers/w1/masters/ds2490.c +13 -20
@@ -177,28 +177,9 @@ struct ds_status }; -static struct usb_device_id ds_id_table [] = { - {USB_DEVICE (0x04fa ,0x2490 ) }, - { }, -}; -MODULE_DEVICE_TABLE (usb, ds_id_table); - -static int ds_probe (struct usb_interface *,const struct usb_device_id *); -static void ds_disconnect (struct usb_interface *); - -static int ds_send_control (struct ds_device *,u16 ,u16 ); -static int ds_send_control_cmd (struct ds_device *,u16 ,u16 ); -static LIST_HEAD (ds_devices);static DEFINE_MUTEX (ds_mutex); -static struct usb_driver ds_driver = { - .name ="DS9490R" , - .probe = ds_probe, - .disconnect = ds_disconnect, - .id_table = ds_id_table, -}; -static int ds_send_control_cmd (struct ds_device *dev,u16 value,u16 index) {int err;
@@ -1083,8 +1064,20 @@ static void ds_disconnect(struct usb_interface *intf)kfree (dev); } +static struct usb_device_id ds_id_table [] = { + {USB_DEVICE (0x04fa ,0x2490 ) }, + { }, +}; +MODULE_DEVICE_TABLE (usb, ds_id_table); + +static struct usb_driver ds_driver = { + .name ="DS9490R" , + .probe = ds_probe, + .disconnect = ds_disconnect, + .id_table = ds_id_table, +};module_usb_driver (ds_driver); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" );MODULE_DESCRIPTION ("DS2490 USB <-> W1 bus master driver (DS9490*)" ); +MODULE_LICENSE ("GPL" );
drivers/w1/masters/matrox_w1.c +17 -23
@@ -38,26 +38,6 @@#include "../w1_int.h" #include "../w1_log.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); -MODULE_DESCRIPTION ("Driver for transport(Dallas 1-wire protocol) over VGA DDC(matrox gpio)." ); - -static struct pci_device_id matrox_w1_tbl[] = { - {PCI_DEVICE (PCI_VENDOR_ID_MATROX ,PCI_DEVICE_ID_MATROX_G400 ) }, - { }, -}; -MODULE_DEVICE_TABLE (pci, matrox_w1_tbl); - -static int matrox_w1_probe (struct pci_dev *,const struct pci_device_id *); -static void matrox_w1_remove (struct pci_dev *); - -static struct pci_driver matrox_w1_pci_driver = { - .name ="matrox_w1" , - .id_table = matrox_w1_tbl, - .probe = matrox_w1_probe, - .remove = matrox_w1_remove, -}; -/* * Matrox G400 DDC registers. */
@@ -89,9 +69,6 @@ struct matrox_devicestruct w1_bus_master *bus_master; }; -static u8 matrox_w1_read_ddc_bit (void *); -static void matrox_w1_write_ddc_bit (void *,u8 ); -/* * These functions read and write DDC Data bit. *
@@ -232,4 +209,21 @@ static void matrox_w1_remove(struct pci_dev *pdev) }kfree (dev); } + +static struct pci_device_id matrox_w1_tbl[] = { + {PCI_DEVICE (PCI_VENDOR_ID_MATROX ,PCI_DEVICE_ID_MATROX_G400 ) }, + { }, +}; +MODULE_DEVICE_TABLE (pci, matrox_w1_tbl); + +static struct pci_driver matrox_w1_pci_driver = { + .name ="matrox_w1" , + .id_table = matrox_w1_tbl, + .probe = matrox_w1_probe, + .remove = matrox_w1_remove, +};module_pci_driver (matrox_w1_pci_driver); + +MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for transport(Dallas 1-wire protocol) over VGA DDC(matrox gpio)." ); +MODULE_LICENSE ("GPL" );
drivers/w1/masters/omap_hdq.c +24 -33
83 lines not on this page · raw message
drivers/w1/slaves/w1_bq27000.c +4 -5
@@ -25,6 +25,8 @@#define HDQ_CMD_WRITE (1<<7)static int F_ID ; +module_param (F_ID , int,S_IRUSR ); +MODULE_PARM_DESC (F_ID ,"1-wire slave FID for BQ device" );static int w1_bq27000_read (struct device *dev,unsigned int reg) {
@@ -106,13 +108,10 @@ static void __exit w1_bq27000_exit(void)w1_unregister_family (&w1_bq27000_family); } -module_init (w1_bq27000_init);module_exit (w1_bq27000_exit); -module_param (F_ID , int,S_IRUSR ); -MODULE_PARM_DESC (F_ID ,"1-wire slave FID for BQ device" ); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_BQ27000 )); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Texas Instruments Ltd" );MODULE_DESCRIPTION ("HDQ/1-wire slave driver bq27000 battery monitor chip" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_BQ27000 ));
drivers/w1/slaves/w1_ds2406.c +4 -4
@@ -21,10 +21,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Scott Alfter <[email protected]>" ); -MODULE_DESCRIPTION ("w1 family 12 driver for DS2406 2 Pin IO" ); -#define W1_F12_FUNC_READ_STATUS 0xAA#define W1_F12_FUNC_WRITE_STATUS 0x55
@@ -154,3 +150,7 @@ static struct w1_family w1_family_12 = { .fops = &w1_f12_fops, };module_w1_family (w1_family_12); + +MODULE_AUTHOR ("Scott Alfter <[email protected]>" ); +MODULE_DESCRIPTION ("w1 family 12 driver for DS2406 2 Pin IO" ); +MODULE_LICENSE ("GPL" );
drivers/w1/slaves/w1_ds2408.c +5 -6
@@ -19,12 +19,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Jean-Francois Dagenais <[email protected]>" ); -MODULE_DESCRIPTION ("w1 family 29 driver for DS2408 8 Pin IO" ); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2408 )); - -#define W1_F29_RETRIES 3#define W1_F29_REG_LOGIG_STATE 0x88/* R */
@@ -352,3 +346,8 @@ static struct w1_family w1_family_29 = { .fops = &w1_f29_fops, };module_w1_family (w1_family_29); + +MODULE_AUTHOR ("Jean-Francois Dagenais <[email protected]>" ); +MODULE_DESCRIPTION ("w1 family 29 driver for DS2408 8 Pin IO" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2408 ));
drivers/w1/slaves/w1_ds2413.c +5 -5
@@ -20,11 +20,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Mariusz Bialonczyk <[email protected]>" ); -MODULE_DESCRIPTION ("w1 family 3a driver for DS2413 2 Pin IO" ); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2413 )); -#define W1_F3A_RETRIES 3#define W1_F3A_FUNC_PIO_ACCESS_READ 0xF5#define W1_F3A_FUNC_PIO_ACCESS_WRITE 0x5A
@@ -136,3 +131,8 @@ static struct w1_family w1_family_3a = { .fops = &w1_f3a_fops, };module_w1_family (w1_family_3a); + +MODULE_AUTHOR ("Mariusz Bialonczyk <[email protected]>" ); +MODULE_DESCRIPTION ("w1 family 3a driver for DS2413 2 Pin IO" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2413 ));
drivers/w1/slaves/w1_ds2423.c +1 -1
@@ -140,7 +140,7 @@ static struct w1_family w1_family_1d = { };module_w1_family (w1_family_1d); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Mika Laitio <[email protected]>" );MODULE_DESCRIPTION ("w1 family 1d driver for DS2423, 4 counters and 4kb ram" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("w1-family-" __stringify(W1_COUNTER_DS2423 ));
drivers/w1/slaves/w1_ds2431.c +1 -1
@@ -290,7 +290,7 @@ static struct w1_family w1_family_2d = { };module_w1_family (w1_family_2d); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Bernhard Weirich <[email protected]>" );MODULE_DESCRIPTION ("w1 family 2d driver for DS2431, 1kb EEPROM" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("w1-family-" __stringify(W1_EEPROM_DS2431 ));
drivers/w1/slaves/w1_ds2433.c +5 -5
@@ -26,11 +26,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Ben Gardner <[email protected]>" ); -MODULE_DESCRIPTION ("w1 family 23 driver for DS2433, 4kb EEPROM" ); -MODULE_ALIAS ("w1-family-" __stringify(W1_EEPROM_DS2433 )); -#define W1_EEPROM_SIZE 512#define W1_PAGE_COUNT 16#define W1_PAGE_SIZE 32
@@ -306,3 +301,8 @@ static struct w1_family w1_family_23 = { .fops = &w1_f23_fops, };module_w1_family (w1_family_23); + +MODULE_AUTHOR ("Ben Gardner <[email protected]>" ); +MODULE_DESCRIPTION ("w1 family 23 driver for DS2433, 4kb EEPROM" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_EEPROM_DS2433 ));
drivers/w1/slaves/w1_ds2760.c +5 -6
@@ -63,11 +63,13 @@ int w1_ds2760_read(struct device *dev, char *buf, int addr, size_t count) {return w1_ds2760_io (dev, buf, addr, count,0 ); } +EXPORT_SYMBOL (w1_ds2760_read);int w1_ds2760_write (struct device *dev,char *buf,int addr,size_t count) {return w1_ds2760_io (dev, buf, addr, count,1 ); } +EXPORT_SYMBOL (w1_ds2760_write);static int w1_ds2760_eeprom_cmd (struct device *dev,int addr,int cmd) {
@@ -91,11 +93,13 @@ int w1_ds2760_store_eeprom(struct device *dev, int addr) {return w1_ds2760_eeprom_cmd (dev, addr,W1_DS2760_COPY_DATA ); } +EXPORT_SYMBOL (w1_ds2760_store_eeprom);int w1_ds2760_recall_eeprom (struct device *dev,int addr) {return w1_ds2760_eeprom_cmd (dev, addr,W1_DS2760_RECALL_DATA ); } +EXPORT_SYMBOL (w1_ds2760_recall_eeprom); static ssize_t w1_slave_read(struct file *filp, struct kobject *kobj, struct bin_attribute *bin_attr, char *buf,
@@ -164,12 +168,7 @@ static struct w1_family w1_ds2760_family = { };module_w1_family (w1_ds2760_family); -EXPORT_SYMBOL (w1_ds2760_read); -EXPORT_SYMBOL (w1_ds2760_write); -EXPORT_SYMBOL (w1_ds2760_store_eeprom); -EXPORT_SYMBOL (w1_ds2760_recall_eeprom); - -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Szabolcs Gyurko <[email protected]>" );MODULE_DESCRIPTION ("1-wire Driver Dallas 2760 battery monitor chip" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2760 ));
drivers/w1/slaves/w1_ds2780.c +1 -1
@@ -156,7 +156,7 @@ static struct w1_family w1_ds2780_family = { };module_w1_family (w1_ds2780_family); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Clifton Barnes <[email protected]>" );MODULE_DESCRIPTION ("1-wire Driver for Maxim/Dallas DS2780 Stand-Alone Fuel Gauge IC" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2780 ));
drivers/w1/slaves/w1_ds2781.c +1 -1
@@ -153,7 +153,7 @@ static struct w1_family w1_ds2781_family = { };module_w1_family (w1_ds2781_family); -MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Renata Sayakhova <[email protected]>" );MODULE_DESCRIPTION ("1-wire Driver for Maxim/Dallas DS2781 Stand-Alone Fuel Gauge IC" ); +MODULE_LICENSE ("GPL" );MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS2781 ));
drivers/w1/slaves/w1_ds28e04.c +5 -5
@@ -24,11 +24,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Markus Franke <[email protected]>, <[email protected]>" ); -MODULE_DESCRIPTION ("w1 family 1C driver for DS28E04, 4kb EEPROM and PIO" ); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS28E04 )); -/* Allow the strong pullup to be disabled, but default to enabled. * If it was disabled a parasite powered device might not get the required * current to copy the data from the scratchpad to EEPROM. If it is enabled
@@ -428,3 +423,8 @@ static struct w1_family w1_family_1C = { .fops = &w1_f1C_fops, };module_w1_family (w1_family_1C); + +MODULE_AUTHOR ("Markus Franke <[email protected]>, <[email protected]>" ); +MODULE_DESCRIPTION ("w1 family 1C driver for DS28E04, 4kb EEPROM and PIO" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_DS28E04 ));
drivers/w1/slaves/w1_smem.c +6 -6
@@ -31,12 +31,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); -MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol, 64bit memory family." ); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_SMEM_01 )); -MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_SMEM_81 )); -static struct w1_family w1_smem_family_01 = { .fid =W1_FAMILY_SMEM_01 , };
@@ -70,3 +64,9 @@ static void __exit w1_smem_fini(void)module_init (w1_smem_init);module_exit (w1_smem_fini); + +MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol, 64bit memory family." ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_SMEM_01 )); +MODULE_ALIAS ("w1-family-" __stringify(W1_FAMILY_SMEM_81 ));
drivers/w1/slaves/w1_therm.c +9 -9
@@ -34,15 +34,6 @@#include "../w1_int.h" #include "../w1_family.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); -MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol, temperature family." ); -MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS18S20 )); -MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS1822 )); -MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS18B20 )); -MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS1825 )); -MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS28EA00 )); -/* Allow the strong pullup to be disabled, but default to enabled. * If it was disabled a parasite powered device might not get the require * current to do a temperature conversion. If it is enabled parasite powered
@@ -646,3 +637,12 @@ static void __exit w1_therm_fini(void)module_init (w1_therm_init);module_exit (w1_therm_fini); + +MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol, temperature family." ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS18S20 )); +MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS1822 )); +MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS18B20 )); +MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS1825 )); +MODULE_ALIAS ("w1-family-" __stringify(W1_THERM_DS28EA00 ));
drivers/w1/w1.c +10 -8
@@ -34,20 +34,15 @@#include "w1_family.h" #include "w1_netlink.h" -MODULE_LICENSE ("GPL" ); -MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); -MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol." ); -static int w1_timeout =10 ; -static int w1_timeout_us =0 ; -int w1_max_slave_count =64 ; -int w1_max_slave_ttl =10 ; -module_param_named (timeout, w1_timeout, int,0 );MODULE_PARM_DESC (timeout,"time in seconds between automatic slave searches" ); + +static int w1_timeout_us =0 ;module_param_named (timeout_us, w1_timeout_us, int,0 );MODULE_PARM_DESC (timeout_us,"time in microseconds between automatic slave searches" ); +/* A search stops when w1_max_slave_count devices have been found in that * search. The next search will start over and detect the same set of devices * on a static 1-wire bus. Memory is not allocated based on this number, just
@@ -56,9 +51,12 @@ MODULE_PARM_DESC(timeout_us,* device on the network and w1_max_slave_count is set to 1, the device id can * be read directly skipping the normal slower search process. */ +int w1_max_slave_count =64 ;module_param_named (max_slave_count, w1_max_slave_count, int,0 );MODULE_PARM_DESC (max_slave_count,"maximum number of slaves detected in a search" ); + +int w1_max_slave_ttl =10 ;module_param_named (slave_ttl, w1_max_slave_ttl, int,0 );MODULE_PARM_DESC (slave_ttl,"Number of searches not seeing a slave before it will be removed" );
@@ -1228,3 +1226,7 @@ static void __exit w1_fini(void)module_init (w1_init);module_exit (w1_fini); + +MODULE_AUTHOR ("Evgeniy Polyakov <[email protected]>" ); +MODULE_DESCRIPTION ("Driver for 1-wire Dallas network protocol." ); +MODULE_LICENSE ("GPL" );
drivers/w1/w1_family.c +2 -3
@@ -55,6 +55,7 @@ int w1_register_family(struct w1_family *newf)return ret; } +EXPORT_SYMBOL (w1_register_family);/** * w1_unregister_family() - unregister a device family driver
@@ -87,6 +88,7 @@ void w1_unregister_family(struct w1_family *fent)flush_signals (current); } } +EXPORT_SYMBOL (w1_unregister_family);/* * Should be called under w1_flock held.
@@ -136,6 +138,3 @@ void __w1_family_get(struct w1_family *f)atomic_inc (&f->refcnt);smp_mb__after_atomic (); } - -EXPORT_SYMBOL (w1_unregister_family); -EXPORT_SYMBOL (w1_register_family);
drivers/w1/w1_int.c +1 -2
@@ -179,6 +179,7 @@ int w1_add_master_device(struct w1_bus_master *master)return retval; } +EXPORT_SYMBOL (w1_add_master_device);void __w1_remove_master_device (struct w1_master *dev) {
@@ -251,6 +252,4 @@ void w1_remove_master_device(struct w1_bus_master *bm)__w1_remove_master_device (found); } - -EXPORT_SYMBOL (w1_add_master_device);EXPORT_SYMBOL (w1_remove_master_device);
Signature · 1 line
2.11.0