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

w1: Organize driver source to natural/common order 



Structures 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: default avatarAndrew F. Davis <afd@ti.com>
Acked-by: default avatarEvgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 13b9abfc

drivers/w1/masters/ds2482.c

+19 −26
Original line number Diff line number Diff line
@@ -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 <bgardner@wabtec.com>");

MODULE_DESCRIPTION("DS2482 driver");

MODULE_LICENSE("GPL");

drivers/w1/masters/ds2490.c

+13 −20
Original line number Diff line number Diff line
@@ -179,28 +179,9 @@ struct ds_status 
	u8			reserved2;

};



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;
@@ -1108,8 +1089,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 <zbr@ioremap.net>");

MODULE_DESCRIPTION("DS2490 USB <-> W1 bus master driver (DS9490*)");

MODULE_LICENSE("GPL");

drivers/w1/masters/matrox_w1.c

+17 −23
Original line number Diff line number Diff line
@@ -37,26 +37,6 @@ 
#include "../w1.h"

#include "../w1_int.h"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Evgeniy Polyakov <zbr@ioremap.net>");

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.

 */
@@ -88,9 +68,6 @@ struct matrox_device 
	struct 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.

 *
@@ -226,4 +203,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 <zbr@ioremap.net>");

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
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ 
#define OMAP_HDQ_MAX_USER			4



static DECLARE_WAIT_QUEUE_HEAD(hdq_wait_queue);



static int w1_id;

module_param(w1_id, int, S_IRUSR);

MODULE_PARM_DESC(w1_id, "1-wire id for the slave detection in HDQ mode");



struct hdq_data {

	struct device		*dev;
@@ -76,36 +79,6 @@ struct hdq_data { 


};



static int omap_hdq_probe(struct platform_device *pdev);

static int omap_hdq_remove(struct platform_device *pdev);



static const struct of_device_id omap_hdq_dt_ids[] = {

	{ .compatible = "ti,omap3-1w" },

	{ .compatible = "ti,am4372-hdq" },

	{}

};

MODULE_DEVICE_TABLE(of, omap_hdq_dt_ids);



static struct platform_driver omap_hdq_driver = {

	.probe =	omap_hdq_probe,

	.remove =	omap_hdq_remove,

	.driver =	{

		.name =	"omap_hdq",

		.of_match_table = omap_hdq_dt_ids,

	},

};



static u8 omap_w1_read_byte(void *_hdq);

static void omap_w1_write_byte(void *_hdq, u8 byte);

static u8 omap_w1_reset_bus(void *_hdq);





static struct w1_bus_master omap_w1_master = {

	.read_byte	= omap_w1_read_byte,

	.write_byte	= omap_w1_write_byte,

	.reset_bus	= omap_w1_reset_bus,

};



/* HDQ register I/O routines */

static inline u8 hdq_reg_in(struct hdq_data *hdq_data, u32 offset)

{
@@ -678,6 +651,12 @@ static void omap_w1_write_byte(void *_hdq, u8 byte) 
	}

}



static struct w1_bus_master omap_w1_master = {

	.read_byte	= omap_w1_read_byte,

	.write_byte	= omap_w1_write_byte,

	.reset_bus	= omap_w1_reset_bus,

};



static int omap_hdq_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -787,10 +766,22 @@ static int omap_hdq_remove(struct platform_device *pdev) 
	return 0;

}



module_platform_driver(omap_hdq_driver);

static const struct of_device_id omap_hdq_dt_ids[] = {

	{ .compatible = "ti,omap3-1w" },

	{ .compatible = "ti,am4372-hdq" },

	{}

};

MODULE_DEVICE_TABLE(of, omap_hdq_dt_ids);



module_param(w1_id, int, S_IRUSR);

MODULE_PARM_DESC(w1_id, "1-wire id for the slave detection in HDQ mode");

static struct platform_driver omap_hdq_driver = {

	.probe = omap_hdq_probe,

	.remove = omap_hdq_remove,

	.driver = {

		.name =	"omap_hdq",

		.of_match_table = omap_hdq_dt_ids,

	},

};

module_platform_driver(omap_hdq_driver);



MODULE_AUTHOR("Texas Instruments");

MODULE_DESCRIPTION("HDQ-1W driver Library");

drivers/w1/slaves/w1_bq27000.c

+4 −5
Original line number Diff line number Diff line
@@ -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));

CRA Git | Maintained and supported by SUSTech CRA and CCSE