diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:14:09 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:02 -0500 |
commit | 49cfe4db2ddc4d1b32f2bd4910a5a9d7a0e34ae8 (patch) | |
tree | 995b18a652e4f0853c66db254a62aea854b4a1ac /drivers/crypto/n2_core.c | |
parent | ed5a84cdf593e54969518e82762786fbe1284ce4 (diff) |
Drivers: crypto: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Kent Yoder <key@linux.vnet.ibm.com>
Cc: Jamie Iles <jamie@jamieiles.com>
Cc: Kim Phillips <kim.phillips@freescale.com>
Cc: Shengzhou Liu <Shengzhou.Liu@freescale.com>
Cc: Alex Porosanu <alexandru.porosanu@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/crypto/n2_core.c')
-rw-r--r-- | drivers/crypto/n2_core.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index aab257403b4a..e1f0ab413c3b 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #define DRV_MODULE_VERSION "0.2" | 34 | #define DRV_MODULE_VERSION "0.2" |
35 | #define DRV_MODULE_RELDATE "July 28, 2011" | 35 | #define DRV_MODULE_RELDATE "July 28, 2011" |
36 | 36 | ||
37 | static char version[] __devinitdata = | 37 | static char version[] = |
38 | DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; | 38 | DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; |
39 | 39 | ||
40 | MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); | 40 | MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); |
@@ -1388,7 +1388,7 @@ static int n2_cipher_cra_init(struct crypto_tfm *tfm) | |||
1388 | return 0; | 1388 | return 0; |
1389 | } | 1389 | } |
1390 | 1390 | ||
1391 | static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl) | 1391 | static int __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl) |
1392 | { | 1392 | { |
1393 | struct n2_cipher_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); | 1393 | struct n2_cipher_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); |
1394 | struct crypto_alg *alg; | 1394 | struct crypto_alg *alg; |
@@ -1424,7 +1424,7 @@ static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl) | |||
1424 | return err; | 1424 | return err; |
1425 | } | 1425 | } |
1426 | 1426 | ||
1427 | static int __devinit __n2_register_one_hmac(struct n2_ahash_alg *n2ahash) | 1427 | static int __n2_register_one_hmac(struct n2_ahash_alg *n2ahash) |
1428 | { | 1428 | { |
1429 | struct n2_hmac_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); | 1429 | struct n2_hmac_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); |
1430 | struct ahash_alg *ahash; | 1430 | struct ahash_alg *ahash; |
@@ -1462,7 +1462,7 @@ static int __devinit __n2_register_one_hmac(struct n2_ahash_alg *n2ahash) | |||
1462 | return err; | 1462 | return err; |
1463 | } | 1463 | } |
1464 | 1464 | ||
1465 | static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) | 1465 | static int __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) |
1466 | { | 1466 | { |
1467 | struct n2_ahash_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); | 1467 | struct n2_ahash_alg *p = kzalloc(sizeof(*p), GFP_KERNEL); |
1468 | struct hash_alg_common *halg; | 1468 | struct hash_alg_common *halg; |
@@ -1517,7 +1517,7 @@ static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) | |||
1517 | return err; | 1517 | return err; |
1518 | } | 1518 | } |
1519 | 1519 | ||
1520 | static int __devinit n2_register_algs(void) | 1520 | static int n2_register_algs(void) |
1521 | { | 1521 | { |
1522 | int i, err = 0; | 1522 | int i, err = 0; |
1523 | 1523 | ||
@@ -1545,7 +1545,7 @@ out: | |||
1545 | return err; | 1545 | return err; |
1546 | } | 1546 | } |
1547 | 1547 | ||
1548 | static void __devexit n2_unregister_algs(void) | 1548 | static void n2_unregister_algs(void) |
1549 | { | 1549 | { |
1550 | mutex_lock(&spu_lock); | 1550 | mutex_lock(&spu_lock); |
1551 | if (!--algs_registered) | 1551 | if (!--algs_registered) |
@@ -1822,8 +1822,8 @@ static int spu_mdesc_scan(struct mdesc_handle *mdesc, struct platform_device *de | |||
1822 | return err; | 1822 | return err; |
1823 | } | 1823 | } |
1824 | 1824 | ||
1825 | static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, | 1825 | static int get_irq_props(struct mdesc_handle *mdesc, u64 node, |
1826 | struct spu_mdesc_info *ip) | 1826 | struct spu_mdesc_info *ip) |
1827 | { | 1827 | { |
1828 | const u64 *ino; | 1828 | const u64 *ino; |
1829 | int ino_len; | 1829 | int ino_len; |
@@ -1851,10 +1851,10 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, | |||
1851 | return 0; | 1851 | return 0; |
1852 | } | 1852 | } |
1853 | 1853 | ||
1854 | static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, | 1854 | static int grab_mdesc_irq_props(struct mdesc_handle *mdesc, |
1855 | struct platform_device *dev, | 1855 | struct platform_device *dev, |
1856 | struct spu_mdesc_info *ip, | 1856 | struct spu_mdesc_info *ip, |
1857 | const char *node_name) | 1857 | const char *node_name) |
1858 | { | 1858 | { |
1859 | const unsigned int *reg; | 1859 | const unsigned int *reg; |
1860 | u64 node; | 1860 | u64 node; |
@@ -1883,7 +1883,7 @@ static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, | |||
1883 | static unsigned long n2_spu_hvapi_major; | 1883 | static unsigned long n2_spu_hvapi_major; |
1884 | static unsigned long n2_spu_hvapi_minor; | 1884 | static unsigned long n2_spu_hvapi_minor; |
1885 | 1885 | ||
1886 | static int __devinit n2_spu_hvapi_register(void) | 1886 | static int n2_spu_hvapi_register(void) |
1887 | { | 1887 | { |
1888 | int err; | 1888 | int err; |
1889 | 1889 | ||
@@ -1909,7 +1909,7 @@ static void n2_spu_hvapi_unregister(void) | |||
1909 | 1909 | ||
1910 | static int global_ref; | 1910 | static int global_ref; |
1911 | 1911 | ||
1912 | static int __devinit grab_global_resources(void) | 1912 | static int grab_global_resources(void) |
1913 | { | 1913 | { |
1914 | int err = 0; | 1914 | int err = 0; |
1915 | 1915 | ||
@@ -1973,7 +1973,7 @@ static void release_global_resources(void) | |||
1973 | mutex_unlock(&spu_lock); | 1973 | mutex_unlock(&spu_lock); |
1974 | } | 1974 | } |
1975 | 1975 | ||
1976 | static struct n2_crypto * __devinit alloc_n2cp(void) | 1976 | static struct n2_crypto *alloc_n2cp(void) |
1977 | { | 1977 | { |
1978 | struct n2_crypto *np = kzalloc(sizeof(struct n2_crypto), GFP_KERNEL); | 1978 | struct n2_crypto *np = kzalloc(sizeof(struct n2_crypto), GFP_KERNEL); |
1979 | 1979 | ||
@@ -1993,7 +1993,7 @@ static void free_n2cp(struct n2_crypto *np) | |||
1993 | kfree(np); | 1993 | kfree(np); |
1994 | } | 1994 | } |
1995 | 1995 | ||
1996 | static void __devinit n2_spu_driver_version(void) | 1996 | static void n2_spu_driver_version(void) |
1997 | { | 1997 | { |
1998 | static int n2_spu_version_printed; | 1998 | static int n2_spu_version_printed; |
1999 | 1999 | ||
@@ -2001,7 +2001,7 @@ static void __devinit n2_spu_driver_version(void) | |||
2001 | pr_info("%s", version); | 2001 | pr_info("%s", version); |
2002 | } | 2002 | } |
2003 | 2003 | ||
2004 | static int __devinit n2_crypto_probe(struct platform_device *dev) | 2004 | static int n2_crypto_probe(struct platform_device *dev) |
2005 | { | 2005 | { |
2006 | struct mdesc_handle *mdesc; | 2006 | struct mdesc_handle *mdesc; |
2007 | const char *full_name; | 2007 | const char *full_name; |
@@ -2077,7 +2077,7 @@ out_free_n2cp: | |||
2077 | return err; | 2077 | return err; |
2078 | } | 2078 | } |
2079 | 2079 | ||
2080 | static int __devexit n2_crypto_remove(struct platform_device *dev) | 2080 | static int n2_crypto_remove(struct platform_device *dev) |
2081 | { | 2081 | { |
2082 | struct n2_crypto *np = dev_get_drvdata(&dev->dev); | 2082 | struct n2_crypto *np = dev_get_drvdata(&dev->dev); |
2083 | 2083 | ||
@@ -2092,7 +2092,7 @@ static int __devexit n2_crypto_remove(struct platform_device *dev) | |||
2092 | return 0; | 2092 | return 0; |
2093 | } | 2093 | } |
2094 | 2094 | ||
2095 | static struct n2_mau * __devinit alloc_ncp(void) | 2095 | static struct n2_mau *alloc_ncp(void) |
2096 | { | 2096 | { |
2097 | struct n2_mau *mp = kzalloc(sizeof(struct n2_mau), GFP_KERNEL); | 2097 | struct n2_mau *mp = kzalloc(sizeof(struct n2_mau), GFP_KERNEL); |
2098 | 2098 | ||
@@ -2112,7 +2112,7 @@ static void free_ncp(struct n2_mau *mp) | |||
2112 | kfree(mp); | 2112 | kfree(mp); |
2113 | } | 2113 | } |
2114 | 2114 | ||
2115 | static int __devinit n2_mau_probe(struct platform_device *dev) | 2115 | static int n2_mau_probe(struct platform_device *dev) |
2116 | { | 2116 | { |
2117 | struct mdesc_handle *mdesc; | 2117 | struct mdesc_handle *mdesc; |
2118 | const char *full_name; | 2118 | const char *full_name; |
@@ -2179,7 +2179,7 @@ out_free_ncp: | |||
2179 | return err; | 2179 | return err; |
2180 | } | 2180 | } |
2181 | 2181 | ||
2182 | static int __devexit n2_mau_remove(struct platform_device *dev) | 2182 | static int n2_mau_remove(struct platform_device *dev) |
2183 | { | 2183 | { |
2184 | struct n2_mau *mp = dev_get_drvdata(&dev->dev); | 2184 | struct n2_mau *mp = dev_get_drvdata(&dev->dev); |
2185 | 2185 | ||
@@ -2217,7 +2217,7 @@ static struct platform_driver n2_crypto_driver = { | |||
2217 | .of_match_table = n2_crypto_match, | 2217 | .of_match_table = n2_crypto_match, |
2218 | }, | 2218 | }, |
2219 | .probe = n2_crypto_probe, | 2219 | .probe = n2_crypto_probe, |
2220 | .remove = __devexit_p(n2_crypto_remove), | 2220 | .remove = n2_crypto_remove, |
2221 | }; | 2221 | }; |
2222 | 2222 | ||
2223 | static struct of_device_id n2_mau_match[] = { | 2223 | static struct of_device_id n2_mau_match[] = { |
@@ -2245,7 +2245,7 @@ static struct platform_driver n2_mau_driver = { | |||
2245 | .of_match_table = n2_mau_match, | 2245 | .of_match_table = n2_mau_match, |
2246 | }, | 2246 | }, |
2247 | .probe = n2_mau_probe, | 2247 | .probe = n2_mau_probe, |
2248 | .remove = __devexit_p(n2_mau_remove), | 2248 | .remove = n2_mau_remove, |
2249 | }; | 2249 | }; |
2250 | 2250 | ||
2251 | static int __init n2_init(void) | 2251 | static int __init n2_init(void) |