dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2012-12-21 13:14:09 -08:00
parent ed5a84cdf5
commit 49cfe4db2d
13 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/atmel-aes.c
View File

@ -1036,7 +1036,7 @@ err_aes_algs:
return err; 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 atmel_aes_dev *aes_dd;
struct aes_platform_data *pdata; struct aes_platform_data *pdata;
@ -1152,7 +1152,7 @@ aes_dd_err:
return err; 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; 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 = { static struct platform_driver atmel_aes_driver = {
.probe = atmel_aes_probe, .probe = atmel_aes_probe,
.remove = __devexit_p(atmel_aes_remove), .remove = atmel_aes_remove,
.driver = { .driver = {
.name = "atmel_aes", .name = "atmel_aes",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/crypto/atmel-sha.c
View File

@ -964,7 +964,7 @@ err_sha_algs:
return err; 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 atmel_sha_dev *sha_dd;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -1063,7 +1063,7 @@ sha_dd_err:
return err; 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; 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 = { static struct platform_driver atmel_sha_driver = {
.probe = atmel_sha_probe, .probe = atmel_sha_probe,
.remove = __devexit_p(atmel_sha_remove), .remove = atmel_sha_remove,
.driver = { .driver = {
.name = "atmel_sha", .name = "atmel_sha",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/crypto/atmel-tdes.c
View File

@ -1053,7 +1053,7 @@ err_tdes_algs:
return err; 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 atmel_tdes_dev *tdes_dd;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -1162,7 +1162,7 @@ tdes_dd_err:
return err; 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; 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 = { static struct platform_driver atmel_tdes_driver = {
.probe = atmel_tdes_probe, .probe = atmel_tdes_probe,
.remove = __devexit_p(atmel_tdes_remove), .remove = atmel_tdes_remove,
.driver = { .driver = {
.name = "atmel_tdes", .name = "atmel_tdes",
.owner = THIS_MODULE, .owner = THIS_MODULE,

6
drivers/crypto/bfin_crc.c
View File

@ -586,7 +586,7 @@ static int bfin_crypto_crc_suspend(struct platform_device *pdev, pm_message_t st
* bfin_crypto_crc_probe - Initialize module * 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 device *dev = &pdev->dev;
struct resource *res; struct resource *res;
@ -707,7 +707,7 @@ out_error_free_mem:
* bfin_crypto_crc_remove - Initialize module * 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); 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 = { static struct platform_driver bfin_crypto_crc_driver = {
.probe = bfin_crypto_crc_probe, .probe = bfin_crypto_crc_probe,
.remove = __devexit_p(bfin_crypto_crc_remove), .remove = bfin_crypto_crc_remove,
.suspend = bfin_crypto_crc_suspend, .suspend = bfin_crypto_crc_suspend,
.resume = bfin_crypto_crc_resume, .resume = bfin_crypto_crc_resume,
.driver = { .driver = {

2
drivers/crypto/caam/ctrl.c
View File

@ -420,7 +420,7 @@ static struct platform_driver caam_driver = {
.of_match_table = caam_match, .of_match_table = caam_match,
}, },
.probe = caam_probe, .probe = caam_probe,
.remove = __devexit_p(caam_remove), .remove = caam_remove,
}; };
module_platform_driver(caam_driver); module_platform_driver(caam_driver);

8
drivers/crypto/geode-aes.c
View File

@ -498,8 +498,7 @@ static struct crypto_alg geode_ecb_alg = {
} }
}; };
static void __devexit static void geode_aes_remove(struct pci_dev *dev)
geode_aes_remove(struct pci_dev *dev)
{ {
crypto_unregister_alg(&geode_alg); crypto_unregister_alg(&geode_alg);
crypto_unregister_alg(&geode_ecb_alg); crypto_unregister_alg(&geode_ecb_alg);
@ -513,8 +512,7 @@ geode_aes_remove(struct pci_dev *dev)
} }
static int __devinit static int geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
geode_aes_probe(struct pci_dev *dev, const struct pci_device_id *id)
{ {
int ret; int ret;
ret = pci_enable_device(dev); ret = pci_enable_device(dev);
@ -582,7 +580,7 @@ static struct pci_driver geode_aes_driver = {
.name = "Geode LX AES", .name = "Geode LX AES",
.id_table = geode_aes_tbl, .id_table = geode_aes_tbl,
.probe = geode_aes_probe, .probe = geode_aes_probe,
.remove = __devexit_p(geode_aes_remove) .remove = geode_aes_remove,
}; };
module_pci_driver(geode_aes_driver); module_pci_driver(geode_aes_driver);

6
drivers/crypto/hifn_795x.c
View File

@ -2561,7 +2561,7 @@ static void hifn_tasklet_callback(unsigned long data)
hifn_process_queue(dev); hifn_process_queue(dev);
} }
static int __devinit hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id) static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
{ {
int err, i; int err, i;
struct hifn_device *dev; struct hifn_device *dev;
@ -2696,7 +2696,7 @@ err_out_disable_pci_device:
return err; return err;
} }
static void __devexit hifn_remove(struct pci_dev *pdev) static void hifn_remove(struct pci_dev *pdev)
{ {
int i; int i;
struct hifn_device *dev; struct hifn_device *dev;
@ -2740,7 +2740,7 @@ static struct pci_driver hifn_pci_driver = {
.name = "hifn795x", .name = "hifn795x",
.id_table = hifn_pci_tbl, .id_table = hifn_pci_tbl,
.probe = hifn_probe, .probe = hifn_probe,
.remove = __devexit_p(hifn_remove), .remove = hifn_remove,
}; };
static int __init hifn_init(void) static int __init hifn_init(void)

2
drivers/crypto/mv_cesa.c
View File

@ -1184,7 +1184,7 @@ MODULE_DEVICE_TABLE(of, mv_cesa_of_match_table);
static struct platform_driver marvell_crypto = { static struct platform_driver marvell_crypto = {
.probe = mv_probe, .probe = mv_probe,
.remove = __devexit_p(mv_remove), .remove = mv_remove,
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "mv_crypto", .name = "mv_crypto",

46
drivers/crypto/n2_core.c
View File

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

7
drivers/crypto/nx/nx.c
View File

@ -634,8 +634,7 @@ void nx_crypto_ctx_exit(struct crypto_tfm *tfm)
nx_ctx->out_sg = NULL; nx_ctx->out_sg = NULL;
} }
static int __devinit nx_probe(struct vio_dev *viodev, static int nx_probe(struct vio_dev *viodev, const struct vio_device_id *id)
const struct vio_device_id *id)
{ {
dev_dbg(&viodev->dev, "driver probed: %s resource id: 0x%x\n", dev_dbg(&viodev->dev, "driver probed: %s resource id: 0x%x\n",
viodev->name, viodev->resource_id); viodev->name, viodev->resource_id);
@ -653,7 +652,7 @@ static int __devinit nx_probe(struct vio_dev *viodev,
return nx_register_algs(); return nx_register_algs();
} }
static int __devexit nx_remove(struct vio_dev *viodev) static int nx_remove(struct vio_dev *viodev)
{ {
dev_dbg(&viodev->dev, "entering nx_remove for UA 0x%x\n", dev_dbg(&viodev->dev, "entering nx_remove for UA 0x%x\n",
viodev->unit_address); viodev->unit_address);
@ -689,7 +688,7 @@ static void __exit nx_fini(void)
vio_unregister_driver(&nx_driver.viodriver); vio_unregister_driver(&nx_driver.viodriver);
} }
static struct vio_device_id nx_crypto_driver_ids[] __devinitdata = { static struct vio_device_id nx_crypto_driver_ids[] = {
{ "ibm,sym-encryption-v1", "ibm,sym-encryption" }, { "ibm,sym-encryption-v1", "ibm,sym-encryption" },
{ "", "" } { "", "" }
}; };

4
drivers/crypto/omap-sham.c
View File

@ -1137,7 +1137,7 @@ static void omap_sham_dma_cleanup(struct omap_sham_dev *dd)
} }
} }
static int __devinit omap_sham_probe(struct platform_device *pdev) static int omap_sham_probe(struct platform_device *pdev)
{ {
struct omap_sham_dev *dd; struct omap_sham_dev *dd;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
@ -1250,7 +1250,7 @@ data_err:
return err; return err;
} }
static int __devexit omap_sham_remove(struct platform_device *pdev) static int omap_sham_remove(struct platform_device *pdev)
{ {
static struct omap_sham_dev *dd; static struct omap_sham_dev *dd;
int i; int i;

6
drivers/crypto/picoxcell_crypto.c
View File

@ -1708,7 +1708,7 @@ static bool spacc_is_compatible(struct platform_device *pdev,
return false; return false;
} }
static int __devinit spacc_probe(struct platform_device *pdev) static int spacc_probe(struct platform_device *pdev)
{ {
int i, err, ret = -EINVAL; int i, err, ret = -EINVAL;
struct resource *mem, *irq; struct resource *mem, *irq;
@ -1841,7 +1841,7 @@ static int __devinit spacc_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int __devexit spacc_remove(struct platform_device *pdev) static int spacc_remove(struct platform_device *pdev)
{ {
struct spacc_alg *alg, *next; struct spacc_alg *alg, *next;
struct spacc_engine *engine = platform_get_drvdata(pdev); struct spacc_engine *engine = platform_get_drvdata(pdev);
@ -1868,7 +1868,7 @@ static const struct platform_device_id spacc_id_table[] = {
static struct platform_driver spacc_driver = { static struct platform_driver spacc_driver = {
.probe = spacc_probe, .probe = spacc_probe,
.remove = __devexit_p(spacc_remove), .remove = spacc_remove,
.driver = { .driver = {
.name = "picochip,spacc", .name = "picochip,spacc",
#ifdef CONFIG_PM #ifdef CONFIG_PM

6
drivers/crypto/tegra-aes.c
View File

@ -1047,7 +1047,7 @@ out:
return err; return err;
} }
static int __devexit tegra_aes_remove(struct platform_device *pdev) static int tegra_aes_remove(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct tegra_aes_dev *dd = platform_get_drvdata(pdev); struct tegra_aes_dev *dd = platform_get_drvdata(pdev);
@ -1074,7 +1074,7 @@ static int __devexit tegra_aes_remove(struct platform_device *pdev)
return 0; return 0;
} }
static struct of_device_id tegra_aes_of_match[] __devinitdata = { static struct of_device_id tegra_aes_of_match[] = {
{ .compatible = "nvidia,tegra20-aes", }, { .compatible = "nvidia,tegra20-aes", },
{ .compatible = "nvidia,tegra30-aes", }, { .compatible = "nvidia,tegra30-aes", },
{ }, { },
@ -1082,7 +1082,7 @@ static struct of_device_id tegra_aes_of_match[] __devinitdata = {
static struct platform_driver tegra_aes_driver = { static struct platform_driver tegra_aes_driver = {
.probe = tegra_aes_probe, .probe = tegra_aes_probe,
.remove = __devexit_p(tegra_aes_remove), .remove = tegra_aes_remove,
.driver = { .driver = {
.name = "tegra-aes", .name = "tegra-aes",
.owner = THIS_MODULE, .owner = THIS_MODULE,