Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tpm: clean up tpm_nsc driver for platform_device suspend/resume compliance

Browse source 
Signed-off-by: Marcel Selhorst <tpm@selhorst.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
David Smith 2009-01-07 18:08:57 -08:00 committed by Linus Torvalds
parent ad8f07ccad
commit 09f50c9542
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
drivers/char/tpm/tpm_nsc.c
View file

@ -273,12 +273,23 @@ static void tpm_nsc_remove(struct device *dev)
} }
} }
static struct device_driver nsc_drv = { static int tpm_nsc_suspend(struct platform_device *dev, pm_message_t msg)
.name = "tpm_nsc", {
.bus = &platform_bus_type, return tpm_pm_suspend(&dev->dev, msg);
.owner = THIS_MODULE, }
.suspend = tpm_pm_suspend,
.resume = tpm_pm_resume, static int tpm_nsc_resume(struct platform_device *dev)
{
return tpm_pm_resume(&dev->dev);
}
static struct platform_driver nsc_drv = {
.suspend = tpm_nsc_suspend,
.resume = tpm_nsc_resume,
.driver = {
.name = "tpm_nsc",
.owner = THIS_MODULE,
},
}; };
static int __init init_nsc(void) static int __init init_nsc(void)
@ -297,7 +308,7 @@ static int __init init_nsc(void)
return -ENODEV; return -ENODEV;
} }
err = driver_register(&nsc_drv); err = platform_driver_register(&nsc_drv);
if (err) if (err)
return err; return err;
@ -308,17 +319,15 @@ static int __init init_nsc(void)
/* enable the DPM module */ /* enable the DPM module */
tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01); tpm_write_index(nscAddrBase, NSC_LDC_INDEX, 0x01);
pdev = kzalloc(sizeof(struct platform_device), GFP_KERNEL); pdev = platform_device_alloc("tpm_nscl0", -1);
if (!pdev) { if (!pdev) {
rc = -ENOMEM; rc = -ENOMEM;
goto err_unreg_drv; goto err_unreg_drv;
} }
pdev->name = "tpm_nscl0";
pdev->id = -1;
pdev->num_resources = 0; pdev->num_resources = 0;
pdev->dev.driver = &nsc_drv.driver;
pdev->dev.release = tpm_nsc_remove; pdev->dev.release = tpm_nsc_remove;
pdev->dev.driver = &nsc_drv;
if ((rc = platform_device_register(pdev)) < 0) if ((rc = platform_device_register(pdev)) < 0)
goto err_free_dev; goto err_free_dev;
@ -377,7 +386,7 @@ static int __init init_nsc(void)
err_free_dev: err_free_dev:
kfree(pdev); kfree(pdev);
err_unreg_drv: err_unreg_drv:
driver_unregister(&nsc_drv); platform_driver_unregister(&nsc_drv);
return rc; return rc;
} }
@ -390,7 +399,7 @@ static void __exit cleanup_nsc(void)
pdev = NULL; pdev = NULL;
} }
driver_unregister(&nsc_drv); platform_driver_unregister(&nsc_drv);
} }
module_init(init_nsc); module_init(init_nsc);