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

Commit 19b94d2d authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Peter Huewe
Browse files

tpm: tpm_tis: Fix compile problems with CONFIG_PM_SLEEP/CONFIG_PNP 



If CONFIG_PM_SLEEP=n, CONFIG_PNP=y we get this warning:

drivers/char/tpm/tpm_tis.c:706:13: warning: 'tpm_tis_reenable_interrupts' defined but not used [-Wunused-function]

This seems to have been introduced in a2fa3fb0 'tpm: convert tpm_tis driver
to use dev_pm_ops from legacy pm_ops'

Also, unpon reviewing, the #ifdefs around tpm_tis_pm are not right, the first
reference is protected, the second is not. tpm_tis_pm is always defined so we
can drop the #ifdef.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
parent e3302e0d

drivers/char/tpm/tpm_tis.c

+1 −5
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ out_err: 
	return rc;

}



#if defined(CONFIG_PNP) || defined(CONFIG_PM_SLEEP)

#ifdef CONFIG_PM_SLEEP

static void tpm_tis_reenable_interrupts(struct tpm_chip *chip)

{

	u32 intmask;
@@ -723,9 +723,7 @@ static void tpm_tis_reenable_interrupts(struct tpm_chip *chip) 
	iowrite32(intmask,

		  chip->vendor.iobase + TPM_INT_ENABLE(chip->vendor.locality));

}

#endif



#ifdef CONFIG_PM_SLEEP

static int tpm_tis_resume(struct device *dev)

{

	struct tpm_chip *chip = dev_get_drvdata(dev);
@@ -794,11 +792,9 @@ static struct pnp_driver tis_pnp_driver = { 
	.id_table = tpm_pnp_tbl,

	.probe = tpm_tis_pnp_init,

	.remove = tpm_tis_pnp_remove,

#ifdef CONFIG_PM_SLEEP

	.driver	= {

		.pm = &tpm_tis_pm,

	},

#endif

};



#define TIS_HID_USR_IDX sizeof(tpm_pnp_tbl)/sizeof(struct pnp_device_id) -2