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

Commit 479e2bce authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

w1: remove use of __devinit 



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f91a66c9

drivers/w1/masters/matrox_w1.c

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static struct pci_device_id matrox_w1_tbl[] = { 
};

MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);



static int __devinit matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);

static int matrox_w1_probe(struct pci_dev *, const struct pci_device_id *);

static void __devexit matrox_w1_remove(struct pci_dev *);



static struct pci_driver matrox_w1_pci_driver = {
@@ -152,7 +152,7 @@ static void matrox_w1_hw_init(struct matrox_device *dev) 
	matrox_w1_write_reg(dev, MATROX_GET_CONTROL, 0x00);

}



static int __devinit matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct matrox_device *dev;

	int err;

drivers/w1/masters/mxc_w1.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static u8 mxc_w1_ds2_touch_bit(void *data, u8 bit) 
	return ((__raw_readb(ctrl_addr)) >> 3) & 0x1;

}



static int __devinit mxc_w1_probe(struct platform_device *pdev)

static int mxc_w1_probe(struct platform_device *pdev)

{

	struct mxc_w1_device *mdev;

	struct resource *res;

drivers/w1/masters/omap_hdq.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ struct hdq_data { 
	int			init_trans;

};



static int __devinit omap_hdq_probe(struct platform_device *pdev);

static int omap_hdq_probe(struct platform_device *pdev);

static int __devexit omap_hdq_remove(struct platform_device *pdev);



static struct platform_driver omap_hdq_driver = {
@@ -537,7 +537,7 @@ static void omap_w1_write_byte(void *_hdq, u8 byte) 
	}

}



static int __devinit omap_hdq_probe(struct platform_device *pdev)

static int omap_hdq_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct hdq_data *hdq_data;