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

Commit afc6d369 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

tpm: remove use of __devinit 



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Rajiv Andrade <mail@srajiv.net>
Cc: Marcel Selhorst <tpmdd@selhorst.net>
Cc: Sirrix AG <tpmdd@sirrix.com>
Acked-by: default avatarKent Yoder <key@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 610141ee

drivers/char/tpm/tpm_i2c_infineon.c

+2 −2
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static struct tpm_vendor_specific tpm_tis_i2c = { 
	.miscdev.fops = &tis_ops,

};



static int __devinit tpm_tis_i2c_init(struct device *dev)

static int tpm_tis_i2c_init(struct device *dev)

{

	u32 vendor;

	int rc = 0;
@@ -632,7 +632,7 @@ static const struct i2c_device_id tpm_tis_i2c_table[] = { 
MODULE_DEVICE_TABLE(i2c, tpm_tis_i2c_table);

static SIMPLE_DEV_PM_OPS(tpm_tis_i2c_ops, tpm_pm_suspend, tpm_pm_resume);



static int __devinit tpm_tis_i2c_probe(struct i2c_client *client,

static int tpm_tis_i2c_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

{

	int rc;

drivers/char/tpm/tpm_ibmvtpm.c

+1 −1
Original line number Diff line number Diff line
@@ -602,7 +602,7 @@ static void ibmvtpm_tasklet(void *data) 
 *	0 - Success

 *	Non-zero - Failure

 */

static int __devinit tpm_ibmvtpm_probe(struct vio_dev *vio_dev,

static int tpm_ibmvtpm_probe(struct vio_dev *vio_dev,

				   const struct vio_device_id *id)

{

	struct ibmvtpm_dev *ibmvtpm;

drivers/char/tpm/tpm_infineon.c

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ static const struct pnp_device_id tpm_inf_pnp_tbl[] = { 


MODULE_DEVICE_TABLE(pnp, tpm_inf_pnp_tbl);



static int __devinit tpm_inf_pnp_probe(struct pnp_dev *dev,

static int tpm_inf_pnp_probe(struct pnp_dev *dev,

				       const struct pnp_device_id *dev_id)

{

	int rc = 0;

drivers/char/tpm/tpm_tis.c

+1 −1
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) 
#endif



#ifdef CONFIG_PNP

static int __devinit tpm_tis_pnp_init(struct pnp_dev *pnp_dev,

static int tpm_tis_pnp_init(struct pnp_dev *pnp_dev,

				      const struct pnp_device_id *pnp_id)

{

	resource_size_t start, len;