aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tpm/tpm_i2c_infineon.c4
-rw-r--r--drivers/char/tpm/tpm_ibmvtpm.c2
-rw-r--r--drivers/char/tpm/tpm_infineon.c4
-rw-r--r--drivers/char/tpm/tpm_tis.c2
4 files changed, 6 insertions, 6 deletions
diff --git a/drivers/char/tpm/tpm_i2c_infineon.c b/drivers/char/tpm/tpm_i2c_infineon.c
index 5a831aec9d4..bcdb078c1b8 100644
--- a/drivers/char/tpm/tpm_i2c_infineon.c
+++ b/drivers/char/tpm/tpm_i2c_infineon.c
@@ -555,7 +555,7 @@ static struct tpm_vendor_specific tpm_tis_i2c = {
555 .miscdev.fops = &tis_ops, 555 .miscdev.fops = &tis_ops,
556}; 556};
557 557
558static int __devinit tpm_tis_i2c_init(struct device *dev) 558static int tpm_tis_i2c_init(struct device *dev)
559{ 559{
560 u32 vendor; 560 u32 vendor;
561 int rc = 0; 561 int rc = 0;
@@ -632,7 +632,7 @@ static const struct i2c_device_id tpm_tis_i2c_table[] = {
632MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table); 632MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table);
633static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume); 633static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);
634 634
635static int __devinit tpm_tis_i2c_probe(struct i2c_client *client, 635static int tpm_tis_i2c_probe(struct i2c_client *client,
636 const struct i2c_device_id *id) 636 const struct i2c_device_id *id)
637{ 637{
638 int rc; 638 int rc;
diff --git a/drivers/char/tpm/tpm_ibmvtpm.c b/drivers/char/tpm/tpm_ibmvtpm.c
index efc4ab36a9d..d9ba6157da9 100644
--- a/drivers/char/tpm/tpm_ibmvtpm.c
+++ b/drivers/char/tpm/tpm_ibmvtpm.c
@@ -602,7 +602,7 @@ static void ibmvtpm_tasklet(void *data)
602 * 0 - Success 602 * 0 - Success
603 * Non-zero - Failure 603 * Non-zero - Failure
604 */ 604 */
605static int __devinit tpm_ibmvtpm_probe(struct vio_dev *vio_dev, 605static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,
606 const struct vio_device_id *id) 606 const struct vio_device_id *id)
607{ 607{
608 struct ibmvtpm_dev *ibmvtpm; 608 struct ibmvtpm_dev *ibmvtpm;
diff --git a/drivers/char/tpm/tpm_infineon.c b/drivers/char/tpm/tpm_infineon.c
index 3251a44e8ce..0126e809867 100644
--- a/drivers/char/tpm/tpm_infineon.c
+++ b/drivers/char/tpm/tpm_infineon.c
@@ -415,7 +415,7 @@ static const struct pnp_device_id tpm_inf_pnp_tbl[] = {
415 415
416MODULE_DEVICE_TABLE(pnp, tpm_inf_pnp_tbl); 416MODULE_DEVICE_TABLE(pnp, tpm_inf_pnp_tbl);
417 417
418static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev, 418static int tpm_inf_pnp_probe(struct pnp_dev *dev,
419 const struct pnp_device_id *dev_id) 419 const struct pnp_device_id *dev_id)
420{ 420{
421 int rc = 0; 421 int rc = 0;
@@ -655,7 +655,7 @@ static struct pnp_driver tpm_inf_pnp_driver = {
655 .probe = tpm_inf_pnp_probe, 655 .probe = tpm_inf_pnp_probe,
656 .suspend = tpm_inf_pnp_suspend, 656 .suspend = tpm_inf_pnp_suspend,
657 .resume = tpm_inf_pnp_resume, 657 .resume = tpm_inf_pnp_resume,
658 .remove = __devexit_p(tpm_inf_pnp_remove) 658 .remove = tpm_inf_pnp_remove
659}; 659};
660 660
661static int __init init_inf(void) 661static int __init init_inf(void)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c
index 6bdf2671254..253161c302b 100644
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
@@ -729,7 +729,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)
729#endif 729#endif
730 730
731#ifdef CONFIG_PNP 731#ifdef CONFIG_PNP
732static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev, 732static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,
733 const struct pnp_device_id *pnp_id) 733 const struct pnp_device_id *pnp_id)
734{ 734{
735 resource_size_t start, len; 735 resource_size_t start, len;