diff options
author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:26:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 15:55:19 -0500 |
commit | 39af33fc458543fd6daaf154e109eba22ab89a8f (patch) | |
tree | da885ed94236d9572c214d1c0cb016f338c9f9fd /drivers/char/hw_random | |
parent | aa89ed9e369b345ef3737c56e7c8934af2df4aa6 (diff) |
char: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: David Airlie <airlied@linux.ie>
Cc: Olof Johansson <olof@lixom.net>
Cc: Mattia Dongili <malattia@linux.it>
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Cc: Rajiv Andrade <mail@srajiv.net>
Cc: Marcel Selhorst <tpmdd@selhorst.net>
Cc: Sirrix AG <tpmdd@sirrix.com>
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-arm-kernel@lists.infradead.org
Cc: openipmi-developer@lists.sourceforge.net
Cc: platform-driver-x86@vger.kernel.org
Cc: tpmdd-devel@lists.sourceforge.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/hw_random')
-rw-r--r-- | drivers/char/hw_random/atmel-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/bcm63xx-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/exynos-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/n2-drv.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/pasemi-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/picoxcell-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/ppc4xx-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/timeriomem-rng.c | 2 | ||||
-rw-r--r-- | drivers/char/hw_random/virtio-rng.c | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c index 731c9046cf7b..5a4a6e70478b 100644 --- a/drivers/char/hw_random/atmel-rng.c +++ b/drivers/char/hw_random/atmel-rng.c | |||
@@ -98,7 +98,7 @@ err_enable: | |||
98 | return ret; | 98 | return ret; |
99 | } | 99 | } |
100 | 100 | ||
101 | static int __devexit atmel_trng_remove(struct platform_device *pdev) | 101 | static int atmel_trng_remove(struct platform_device *pdev) |
102 | { | 102 | { |
103 | struct atmel_trng *trng = platform_get_drvdata(pdev); | 103 | struct atmel_trng *trng = platform_get_drvdata(pdev); |
104 | 104 | ||
diff --git a/drivers/char/hw_random/bcm63xx-rng.c b/drivers/char/hw_random/bcm63xx-rng.c index aec6a4277caa..ae95bcb18d4a 100644 --- a/drivers/char/hw_random/bcm63xx-rng.c +++ b/drivers/char/hw_random/bcm63xx-rng.c | |||
@@ -145,7 +145,7 @@ out: | |||
145 | return ret; | 145 | return ret; |
146 | } | 146 | } |
147 | 147 | ||
148 | static int __devexit bcm63xx_rng_remove(struct platform_device *pdev) | 148 | static int bcm63xx_rng_remove(struct platform_device *pdev) |
149 | { | 149 | { |
150 | struct hwrng *rng = platform_get_drvdata(pdev); | 150 | struct hwrng *rng = platform_get_drvdata(pdev); |
151 | struct bcm63xx_rng_priv *priv = to_rng_priv(rng); | 151 | struct bcm63xx_rng_priv *priv = to_rng_priv(rng); |
diff --git a/drivers/char/hw_random/exynos-rng.c b/drivers/char/hw_random/exynos-rng.c index 232ba9ce579c..bdc852ea7632 100644 --- a/drivers/char/hw_random/exynos-rng.c +++ b/drivers/char/hw_random/exynos-rng.c | |||
@@ -134,7 +134,7 @@ static int __devinit exynos_rng_probe(struct platform_device *pdev) | |||
134 | return hwrng_register(&exynos_rng->rng); | 134 | return hwrng_register(&exynos_rng->rng); |
135 | } | 135 | } |
136 | 136 | ||
137 | static int __devexit exynos_rng_remove(struct platform_device *pdev) | 137 | static int exynos_rng_remove(struct platform_device *pdev) |
138 | { | 138 | { |
139 | struct exynos_rng *exynos_rng = platform_get_drvdata(pdev); | 139 | struct exynos_rng *exynos_rng = platform_get_drvdata(pdev); |
140 | 140 | ||
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c index fd57d8a9faff..d68a72a08b51 100644 --- a/drivers/char/hw_random/n2-drv.c +++ b/drivers/char/hw_random/n2-drv.c | |||
@@ -719,7 +719,7 @@ out: | |||
719 | return err; | 719 | return err; |
720 | } | 720 | } |
721 | 721 | ||
722 | static int __devexit n2rng_remove(struct platform_device *op) | 722 | static int n2rng_remove(struct platform_device *op) |
723 | { | 723 | { |
724 | struct n2rng *np = dev_get_drvdata(&op->dev); | 724 | struct n2rng *np = dev_get_drvdata(&op->dev); |
725 | 725 | ||
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c index 3a632673aed5..a1f70407cc9e 100644 --- a/drivers/char/hw_random/pasemi-rng.c +++ b/drivers/char/hw_random/pasemi-rng.c | |||
@@ -122,7 +122,7 @@ static int __devinit rng_probe(struct platform_device *ofdev) | |||
122 | return err; | 122 | return err; |
123 | } | 123 | } |
124 | 124 | ||
125 | static int __devexit rng_remove(struct platform_device *dev) | 125 | static int rng_remove(struct platform_device *dev) |
126 | { | 126 | { |
127 | void __iomem *rng_regs = (void __iomem *)pasemi_rng.priv; | 127 | void __iomem *rng_regs = (void __iomem *)pasemi_rng.priv; |
128 | 128 | ||
diff --git a/drivers/char/hw_random/picoxcell-rng.c b/drivers/char/hw_random/picoxcell-rng.c index 97bd891422c7..d4b24c1dd48e 100644 --- a/drivers/char/hw_random/picoxcell-rng.c +++ b/drivers/char/hw_random/picoxcell-rng.c | |||
@@ -151,7 +151,7 @@ err_enable: | |||
151 | return ret; | 151 | return ret; |
152 | } | 152 | } |
153 | 153 | ||
154 | static int __devexit picoxcell_trng_remove(struct platform_device *pdev) | 154 | static int picoxcell_trng_remove(struct platform_device *pdev) |
155 | { | 155 | { |
156 | hwrng_unregister(&picoxcell_trng); | 156 | hwrng_unregister(&picoxcell_trng); |
157 | clk_disable(rng_clk); | 157 | clk_disable(rng_clk); |
diff --git a/drivers/char/hw_random/ppc4xx-rng.c b/drivers/char/hw_random/ppc4xx-rng.c index c51762c13031..af6506a69cd9 100644 --- a/drivers/char/hw_random/ppc4xx-rng.c +++ b/drivers/char/hw_random/ppc4xx-rng.c | |||
@@ -111,7 +111,7 @@ static int __devinit ppc4xx_rng_probe(struct platform_device *dev) | |||
111 | return err; | 111 | return err; |
112 | } | 112 | } |
113 | 113 | ||
114 | static int __devexit ppc4xx_rng_remove(struct platform_device *dev) | 114 | static int ppc4xx_rng_remove(struct platform_device *dev) |
115 | { | 115 | { |
116 | void __iomem *rng_regs = (void __iomem *) ppc4xx_rng.priv; | 116 | void __iomem *rng_regs = (void __iomem *) ppc4xx_rng.priv; |
117 | 117 | ||
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c index f1a1618db1fb..3a1abc9417e4 100644 --- a/drivers/char/hw_random/timeriomem-rng.c +++ b/drivers/char/hw_random/timeriomem-rng.c | |||
@@ -130,7 +130,7 @@ failed: | |||
130 | return ret; | 130 | return ret; |
131 | } | 131 | } |
132 | 132 | ||
133 | static int __devexit timeriomem_rng_remove(struct platform_device *pdev) | 133 | static int timeriomem_rng_remove(struct platform_device *pdev) |
134 | { | 134 | { |
135 | del_timer_sync(&timeriomem_rng_timer); | 135 | del_timer_sync(&timeriomem_rng_timer); |
136 | hwrng_unregister(&timeriomem_rng_ops); | 136 | hwrng_unregister(&timeriomem_rng_ops); |
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 5708299507d0..621f595f1a98 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c | |||
@@ -119,7 +119,7 @@ static int virtrng_probe(struct virtio_device *vdev) | |||
119 | return probe_common(vdev); | 119 | return probe_common(vdev); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void __devexit virtrng_remove(struct virtio_device *vdev) | 122 | static void virtrng_remove(struct virtio_device *vdev) |
123 | { | 123 | { |
124 | remove_common(vdev); | 124 | remove_common(vdev); |
125 | } | 125 | } |