diff options
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 aab257403b4..e1f0ab413c3 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c @@ -34,7 +34,7 @@  #define DRV_MODULE_VERSION	"0.2"  #define DRV_MODULE_RELDATE	"July 28, 2011" -static char version[] __devinitdata = +static char version[] =  	DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";  MODULE_AUTHOR("David S. Miller (davem@davemloft.net)"); @@ -1388,7 +1388,7 @@ static int n2_cipher_cra_init(struct crypto_tfm *tfm)  	return 0;  } -static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl) +static int __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl)  {  	struct n2_cipher_alg *p = kzalloc(sizeof(*p), GFP_KERNEL);  	struct crypto_alg *alg; @@ -1424,7 +1424,7 @@ static int __devinit __n2_register_one_cipher(const struct n2_cipher_tmpl *tmpl)  	return err;  } -static int __devinit __n2_register_one_hmac(struct n2_ahash_alg *n2ahash) +static int __n2_register_one_hmac(struct n2_ahash_alg *n2ahash)  {  	struct n2_hmac_alg *p = kzalloc(sizeof(*p), GFP_KERNEL);  	struct ahash_alg *ahash; @@ -1462,7 +1462,7 @@ static int __devinit __n2_register_one_hmac(struct n2_ahash_alg *n2ahash)  	return err;  } -static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) +static int __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl)  {  	struct n2_ahash_alg *p = kzalloc(sizeof(*p), GFP_KERNEL);  	struct hash_alg_common *halg; @@ -1517,7 +1517,7 @@ static int __devinit __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl)  	return err;  } -static int __devinit n2_register_algs(void) +static int n2_register_algs(void)  {  	int i, err = 0; @@ -1545,7 +1545,7 @@ out:  	return err;  } -static void __devexit n2_unregister_algs(void) +static void n2_unregister_algs(void)  {  	mutex_lock(&spu_lock);  	if (!--algs_registered) @@ -1822,8 +1822,8 @@ static int spu_mdesc_scan(struct mdesc_handle *mdesc, struct platform_device *de  	return err;  } -static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, -				   struct spu_mdesc_info *ip) +static int get_irq_props(struct mdesc_handle *mdesc, u64 node, +			 struct spu_mdesc_info *ip)  {  	const u64 *ino;  	int ino_len; @@ -1851,10 +1851,10 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node,  	return 0;  } -static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, -					  struct platform_device *dev, -					  struct spu_mdesc_info *ip, -					  const char *node_name) +static int grab_mdesc_irq_props(struct mdesc_handle *mdesc, +				struct platform_device *dev, +				struct spu_mdesc_info *ip, +				const char *node_name)  {  	const unsigned int *reg;  	u64 node; @@ -1883,7 +1883,7 @@ static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc,  static unsigned long n2_spu_hvapi_major;  static unsigned long n2_spu_hvapi_minor; -static int __devinit n2_spu_hvapi_register(void) +static int n2_spu_hvapi_register(void)  {  	int err; @@ -1909,7 +1909,7 @@ static void n2_spu_hvapi_unregister(void)  static int global_ref; -static int __devinit grab_global_resources(void) +static int grab_global_resources(void)  {  	int err = 0; @@ -1973,7 +1973,7 @@ static void release_global_resources(void)  	mutex_unlock(&spu_lock);  } -static struct n2_crypto * __devinit alloc_n2cp(void) +static struct n2_crypto *alloc_n2cp(void)  {  	struct n2_crypto *np = kzalloc(sizeof(struct n2_crypto), GFP_KERNEL); @@ -1993,7 +1993,7 @@ static void free_n2cp(struct n2_crypto *np)  	kfree(np);  } -static void __devinit n2_spu_driver_version(void) +static void n2_spu_driver_version(void)  {  	static int n2_spu_version_printed; @@ -2001,7 +2001,7 @@ static void __devinit n2_spu_driver_version(void)  		pr_info("%s", version);  } -static int __devinit n2_crypto_probe(struct platform_device *dev) +static int n2_crypto_probe(struct platform_device *dev)  {  	struct mdesc_handle *mdesc;  	const char *full_name; @@ -2077,7 +2077,7 @@ out_free_n2cp:  	return err;  } -static int __devexit n2_crypto_remove(struct platform_device *dev) +static int n2_crypto_remove(struct platform_device *dev)  {  	struct n2_crypto *np = dev_get_drvdata(&dev->dev); @@ -2092,7 +2092,7 @@ static int __devexit n2_crypto_remove(struct platform_device *dev)  	return 0;  } -static struct n2_mau * __devinit alloc_ncp(void) +static struct n2_mau *alloc_ncp(void)  {  	struct n2_mau *mp = kzalloc(sizeof(struct n2_mau), GFP_KERNEL); @@ -2112,7 +2112,7 @@ static void free_ncp(struct n2_mau *mp)  	kfree(mp);  } -static int __devinit n2_mau_probe(struct platform_device *dev) +static int n2_mau_probe(struct platform_device *dev)  {  	struct mdesc_handle *mdesc;  	const char *full_name; @@ -2179,7 +2179,7 @@ out_free_ncp:  	return err;  } -static int __devexit n2_mau_remove(struct platform_device *dev) +static int n2_mau_remove(struct platform_device *dev)  {  	struct n2_mau *mp = dev_get_drvdata(&dev->dev); @@ -2217,7 +2217,7 @@ static struct platform_driver n2_crypto_driver = {  		.of_match_table	=	n2_crypto_match,  	},  	.probe		=	n2_crypto_probe, -	.remove		=	__devexit_p(n2_crypto_remove), +	.remove		=	n2_crypto_remove,  };  static struct of_device_id n2_mau_match[] = { @@ -2245,7 +2245,7 @@ static struct platform_driver n2_mau_driver = {  		.of_match_table	=	n2_mau_match,  	},  	.probe		=	n2_mau_probe, -	.remove		=	__devexit_p(n2_mau_remove), +	.remove		=	n2_mau_remove,  };  static int __init n2_init(void)  |