redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

w1: remove use of __devexit

Browse source 
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bill Pemberton 2012-11-19 13:26:23 -05:00 committed by Greg Kroah-Hartman
parent 479e2bcecd
commit 82849a93aa
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/w1/masters/matrox_w1.c
View file

@ -49,7 +49,7 @@ static struct pci_device_id matrox_w1_tbl[] = {
MODULE_DEVICE_TABLE(pci, matrox_w1_tbl); MODULE_DEVICE_TABLE(pci, matrox_w1_tbl);
static int 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 void matrox_w1_remove(struct pci_dev *);
static struct pci_driver matrox_w1_pci_driver = { static struct pci_driver matrox_w1_pci_driver = {
.name = "matrox_w1", .name = "matrox_w1",
@ -220,7 +220,7 @@ err_out_free_device:
return err; 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); struct matrox_device *dev = pci_get_drvdata(pdev);

2
drivers/w1/masters/mxc_w1.c
View file

@ -167,7 +167,7 @@ failed_clk:
/* /*
* disassociate the w1 device from the driver * 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 mxc_w1_device *mdev = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;

4
drivers/w1/masters/omap_hdq.c
View file

@ -70,7 +70,7 @@ struct hdq_data {
}; };
static int 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 int omap_hdq_remove(struct platform_device *pdev);
static struct platform_driver omap_hdq_driver = { static struct platform_driver omap_hdq_driver = {
.probe = omap_hdq_probe, .probe = omap_hdq_probe,
@ -613,7 +613,7 @@ err_w1:
return ret; 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); struct hdq_data *hdq_data = platform_get_drvdata(pdev);