diff options
-rw-r--r-- | drivers/w1/masters/matrox_w1.c | 4 | ||||
-rw-r--r-- | drivers/w1/masters/mxc_w1.c | 2 | ||||
-rw-r--r-- | drivers/w1/masters/omap_hdq.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/drivers/w1/masters/matrox_w1.c b/drivers/w1/masters/matrox_w1.c index 0a3c423a0c9d..1197f7ec54f2 100644 --- a/drivers/w1/masters/matrox_w1.c +++ b/drivers/w1/masters/matrox_w1.c | |||
@@ -48,7 +48,7 @@ static struct pci_device_id matrox_w1_tbl[] = { | |||
48 | }; | 48 | }; |
49 | MODULE_DEVICE_TABLE(pci, matrox_w1_tbl); | 49 | MODULE_DEVICE_TABLE(pci, matrox_w1_tbl); |
50 | 50 | ||
51 | static int __devinit matrox_w1_probe(struct pci_dev *, const struct pci_device_id *); | 51 | static int matrox_w1_probe(struct pci_dev *, const struct pci_device_id *); |
52 | static void __devexit matrox_w1_remove(struct pci_dev *); | 52 | static void __devexit matrox_w1_remove(struct pci_dev *); |
53 | 53 | ||
54 | static struct pci_driver matrox_w1_pci_driver = { | 54 | static struct pci_driver matrox_w1_pci_driver = { |
@@ -152,7 +152,7 @@ static void matrox_w1_hw_init(struct matrox_device *dev) | |||
152 | matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00); | 152 | matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00); |
153 | } | 153 | } |
154 | 154 | ||
155 | static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | 155 | static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent) |
156 | { | 156 | { |
157 | struct matrox_device *dev; | 157 | struct matrox_device *dev; |
158 | int err; | 158 | int err; |
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 53f89fa3bde6..23d391757491 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
@@ -103,7 +103,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit) | |||
103 | return ((__raw_readb(ctrl_addr)) >> 3) & 0x1; | 103 | return ((__raw_readb(ctrl_addr)) >> 3) & 0x1; |
104 | } | 104 | } |
105 | 105 | ||
106 | static int __devinit mxc_w1_probe(struct platform_device *pdev) | 106 | static int mxc_w1_probe(struct platform_device *pdev) |
107 | { | 107 | { |
108 | struct mxc_w1_device *mdev; | 108 | struct mxc_w1_device *mdev; |
109 | struct resource *res; | 109 | struct resource *res; |
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index 652ca7f207e3..d3bdcc320eda 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c | |||
@@ -69,7 +69,7 @@ struct hdq_data { | |||
69 | int init_trans; | 69 | int init_trans; |
70 | }; | 70 | }; |
71 | 71 | ||
72 | static int __devinit omap_hdq_probe(struct platform_device *pdev); | 72 | static int omap_hdq_probe(struct platform_device *pdev); |
73 | static int __devexit omap_hdq_remove(struct platform_device *pdev); | 73 | static int __devexit omap_hdq_remove(struct platform_device *pdev); |
74 | 74 | ||
75 | static struct platform_driver omap_hdq_driver = { | 75 | static struct platform_driver omap_hdq_driver = { |
@@ -537,7 +537,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte) | |||
537 | } | 537 | } |
538 | } | 538 | } |
539 | 539 | ||
540 | static int __devinit omap_hdq_probe(struct platform_device *pdev) | 540 | static int omap_hdq_probe(struct platform_device *pdev) |
541 | { | 541 | { |
542 | struct device *dev = &pdev->dev; | 542 | struct device *dev = &pdev->dev; |
543 | struct hdq_data *hdq_data; | 543 | struct hdq_data *hdq_data; |