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

Commit 82849a93 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

w1: remove use of __devexit 



CONFIG_HOTPLUG is going away as an option so __devexit 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 479e2bce

drivers/w1/masters/matrox_w1.c

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct pci_device_id matrox_w1_tbl[] = { 
MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);



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

static void __devexit matrox_w1_remove(struct pci_dev *);

static void matrox_w1_remove(struct pci_dev *);



static struct pci_driver matrox_w1_pci_driver = {

	.name = "matrox_w1",
@@ -220,7 +220,7 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent 
	return err;

}



static void __devexit matrox_w1_remove(struct pci_dev *pdev)

static void matrox_w1_remove(struct pci_dev *pdev)

{

	struct matrox_device *dev = pci_get_drvdata(pdev);

drivers/w1/masters/mxc_w1.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int mxc_w1_probe(struct platform_device *pdev) 
/*

 * disassociate the w1 device from the driver

 */

static int __devexit mxc_w1_remove(struct platform_device *pdev)

static int mxc_w1_remove(struct platform_device *pdev)

{

	struct mxc_w1_device *mdev = platform_get_drvdata(pdev);

	struct resource *res;

drivers/w1/masters/omap_hdq.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ struct hdq_data { 
};



static int omap_hdq_probe(struct platform_device *pdev);

static int __devexit omap_hdq_remove(struct platform_device *pdev);

static int omap_hdq_remove(struct platform_device *pdev);



static struct platform_driver omap_hdq_driver = {

	.probe =	omap_hdq_probe,
@@ -613,7 +613,7 @@ static int omap_hdq_probe(struct platform_device *pdev) 
	return ret;

}



static int __devexit omap_hdq_remove(struct platform_device *pdev)

static int omap_hdq_remove(struct platform_device *pdev)

{

	struct hdq_data *hdq_data = platform_get_drvdata(pdev);