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

Commit 49cfe4db authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ed5a84cd

drivers/crypto/atmel-aes.c

+3 −3
Original line number Diff line number Diff line
@@ -1036,7 +1036,7 @@ static int atmel_aes_register_algs(struct atmel_aes_dev *dd) 
	return err;

}



static int __devinit atmel_aes_probe(struct platform_device *pdev)

static int atmel_aes_probe(struct platform_device *pdev)

{

	struct atmel_aes_dev *aes_dd;

	struct aes_platform_data	*pdata;
@@ -1152,7 +1152,7 @@ static int __devinit atmel_aes_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit atmel_aes_remove(struct platform_device *pdev)

static int atmel_aes_remove(struct platform_device *pdev)

{

	static struct atmel_aes_dev *aes_dd;
@@ -1185,7 +1185,7 @@ static int __devexit atmel_aes_remove(struct platform_device *pdev) 


static struct platform_driver atmel_aes_driver = {

	.probe		= atmel_aes_probe,

	.remove		= __devexit_p(atmel_aes_remove),

	.remove		= atmel_aes_remove,

	.driver		= {

		.name	= "atmel_aes",

		.owner	= THIS_MODULE,

drivers/crypto/atmel-sha.c

+3 −3
Original line number Diff line number Diff line
@@ -964,7 +964,7 @@ static int atmel_sha_register_algs(struct atmel_sha_dev *dd) 
	return err;

}



static int __devinit atmel_sha_probe(struct platform_device *pdev)

static int atmel_sha_probe(struct platform_device *pdev)

{

	struct atmel_sha_dev *sha_dd;

	struct device *dev = &pdev->dev;
@@ -1063,7 +1063,7 @@ static int __devinit atmel_sha_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit atmel_sha_remove(struct platform_device *pdev)

static int atmel_sha_remove(struct platform_device *pdev)

{

	static struct atmel_sha_dev *sha_dd;
@@ -1093,7 +1093,7 @@ static int __devexit atmel_sha_remove(struct platform_device *pdev) 


static struct platform_driver atmel_sha_driver = {

	.probe		= atmel_sha_probe,

	.remove		= __devexit_p(atmel_sha_remove),

	.remove		= atmel_sha_remove,

	.driver		= {

		.name	= "atmel_sha",

		.owner	= THIS_MODULE,

drivers/crypto/atmel-tdes.c

+3 −3
Original line number Diff line number Diff line
@@ -1053,7 +1053,7 @@ static int atmel_tdes_register_algs(struct atmel_tdes_dev *dd) 
	return err;

}



static int __devinit atmel_tdes_probe(struct platform_device *pdev)

static int atmel_tdes_probe(struct platform_device *pdev)

{

	struct atmel_tdes_dev *tdes_dd;

	struct device *dev = &pdev->dev;
@@ -1162,7 +1162,7 @@ static int __devinit atmel_tdes_probe(struct platform_device *pdev) 
	return err;

}



static int __devexit atmel_tdes_remove(struct platform_device *pdev)

static int atmel_tdes_remove(struct platform_device *pdev)

{

	static struct atmel_tdes_dev *tdes_dd;
@@ -1195,7 +1195,7 @@ static int __devexit atmel_tdes_remove(struct platform_device *pdev) 


static struct platform_driver atmel_tdes_driver = {

	.probe		= atmel_tdes_probe,

	.remove		= __devexit_p(atmel_tdes_remove),

	.remove		= atmel_tdes_remove,

	.driver		= {

		.name	= "atmel_tdes",

		.owner	= THIS_MODULE,

drivers/crypto/bfin_crc.c

+3 −3
Original line number Diff line number Diff line
@@ -586,7 +586,7 @@ static int bfin_crypto_crc_suspend(struct platform_device *pdev, pm_message_t st 
 *	bfin_crypto_crc_probe - Initialize module

 *

 */

static int __devinit bfin_crypto_crc_probe(struct platform_device *pdev)

static int bfin_crypto_crc_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct resource *res;
@@ -707,7 +707,7 @@ static int __devinit bfin_crypto_crc_probe(struct platform_device *pdev) 
 *	bfin_crypto_crc_remove - Initialize module

 *

 */

static int __devexit bfin_crypto_crc_remove(struct platform_device *pdev)

static int bfin_crypto_crc_remove(struct platform_device *pdev)

{

	struct bfin_crypto_crc *crc = platform_get_drvdata(pdev);
@@ -731,7 +731,7 @@ static int __devexit bfin_crypto_crc_remove(struct platform_device *pdev) 


static struct platform_driver bfin_crypto_crc_driver = {

	.probe     = bfin_crypto_crc_probe,

	.remove    = __devexit_p(bfin_crypto_crc_remove),

	.remove    = bfin_crypto_crc_remove,

	.suspend   = bfin_crypto_crc_suspend,

	.resume    = bfin_crypto_crc_resume,

	.driver    = {

drivers/crypto/caam/ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static struct platform_driver caam_driver = { 
		.of_match_table = caam_match,

	},

	.probe       = caam_probe,

	.remove      = __devexit_p(caam_remove),

	.remove      = caam_remove,

};



module_platform_driver(caam_driver);