← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/crypto/n2_core.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/crypto/n2_core.c
2004
2004
                pr_info("%s", version);
2005
2005
}
2006
2006
 
2007
 
static int __devinit n2_crypto_probe(struct platform_device *dev,
2008
 
                                     const struct of_device_id *match)
 
2007
static int __devinit n2_crypto_probe(struct platform_device *dev)
2009
2008
{
2010
2009
        struct mdesc_handle *mdesc;
2011
2010
        const char *full_name;
2116
2115
        kfree(mp);
2117
2116
}
2118
2117
 
2119
 
static int __devinit n2_mau_probe(struct platform_device *dev,
2120
 
                                     const struct of_device_id *match)
 
2118
static int __devinit n2_mau_probe(struct platform_device *dev)
2121
2119
{
2122
2120
        struct mdesc_handle *mdesc;
2123
2121
        const char *full_name;
2211
2209
 
2212
2210
MODULE_DEVICE_TABLE(of, n2_crypto_match);
2213
2211
 
2214
 
static struct of_platform_driver n2_crypto_driver = {
 
2212
static struct platform_driver n2_crypto_driver = {
2215
2213
        .driver = {
2216
2214
                .name           =       "n2cp",
2217
2215
                .owner          =       THIS_MODULE,
2235
2233
 
2236
2234
MODULE_DEVICE_TABLE(of, n2_mau_match);
2237
2235
 
2238
 
static struct of_platform_driver n2_mau_driver = {
 
2236
static struct platform_driver n2_mau_driver = {
2239
2237
        .driver = {
2240
2238
                .name           =       "ncp",
2241
2239
                .owner          =       THIS_MODULE,
2247
2245
 
2248
2246
static int __init n2_init(void)
2249
2247
{
2250
 
        int err = of_register_platform_driver(&n2_crypto_driver);
 
2248
        int err = platform_driver_register(&n2_crypto_driver);
2251
2249
 
2252
2250
        if (!err) {
2253
 
                err = of_register_platform_driver(&n2_mau_driver);
 
2251
                err = platform_driver_register(&n2_mau_driver);
2254
2252
                if (err)
2255
 
                        of_unregister_platform_driver(&n2_crypto_driver);
 
2253
                        platform_driver_unregister(&n2_crypto_driver);
2256
2254
        }
2257
2255
        return err;
2258
2256
}
2259
2257
 
2260
2258
static void __exit n2_exit(void)
2261
2259
{
2262
 
        of_unregister_platform_driver(&n2_mau_driver);
2263
 
        of_unregister_platform_driver(&n2_crypto_driver);
 
2260
        platform_driver_unregister(&n2_mau_driver);
 
2261
        platform_driver_unregister(&n2_crypto_driver);
2264
2262
}
2265
2263
 
2266
2264
module_init(n2_init);