History

tpm/tpm_i2c_stm_st33: Replace access to io_lpcpd from struct st33zp24_platform_data to tpm_stm_dev

io_lpcpd is accessible from struct tpm_stm_dev. struct st33zp24_platform_data is only valid when using static platform configuration data, not when using dts.

Christophe Ricard committed 11 years ago

Commit fe7d3681 parent 34d47b61 file · +11 −7Browse files

Unified · Split

drivers/char/tpm/tpm_i2c_stm_st33.c+11−7
@@ -837,11 +837,14 @@ static int tpm_stm_i2c_remove(struct i2c_client *client) · 836 unmodified lines
837837 */
838838 static int tpm_stm_i2c_pm_suspend(struct device *dev)
839839 {
840− struct st33zp24_platform_data *pin_infos = dev->platform_data;
840+ struct tpm_chip *chip = dev_get_drvdata(dev);
841+ struct tpm_stm_dev *tpm_dev;
841842 int ret = 0;
842843
843− if (gpio_is_valid(pin_infos->io_lpcpd))
844− gpio_set_value(pin_infos->io_lpcpd, 0);
844+ tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip);
845+
846+ if (gpio_is_valid(tpm_dev->io_lpcpd))
847+ gpio_set_value(tpm_dev->io_lpcpd, 0);
845848 else
846849 ret = tpm_pm_suspend(dev);
847850
@@ -856,12 +859,13 @@ static int tpm_stm_i2c_pm_suspend(struct device *dev) · 8 unmodified lines
856859 static int tpm_stm_i2c_pm_resume(struct device *dev)
857860 {
858861 struct tpm_chip *chip = dev_get_drvdata(dev);
859− struct st33zp24_platform_data *pin_infos = dev->platform_data;
860−
862+ struct tpm_stm_dev *tpm_dev;
861863 int ret = 0;
862864
863− if (gpio_is_valid(pin_infos->io_lpcpd)) {
864− gpio_set_value(pin_infos->io_lpcpd, 1);
865+ tpm_dev = (struct tpm_stm_dev *)TPM_VPRIV(chip);
866+
867+ if (gpio_is_valid(tpm_dev->io_lpcpd)) {
868+ gpio_set_value(tpm_dev->io_lpcpd, 1);
865869 ret = wait_for_stat(chip,
866870 TPM_STS_VALID, chip->vendor.timeout_b,
867871 &chip->vendor.read_queue, false);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t