microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

tpm/st33zp24/spi: Change xxx_request_resources header 

Simplify st33zp24_spi_acpi_request_resources, st33zp24_spi_of_request_resources
and st33zp24_spi_request_resources to have the same prototype and using
spi_get_drvdata.

Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
Christophe RICARD 2016-02-23 22:25:51 +01:00 коммит произвёл Jarkko Sakkinen
Родитель 740ec346f3
Коммит 4d8007ee26
1 изменённых файлов: 17 добавлений и 14 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

31
drivers/char/tpm/st33zp24/spi.c
Просмотреть файл

@ -229,9 +229,9 @@ static const struct st33zp24_phy_ops spi_phy_ops = {
.recv = st33zp24_spi_recv, .recv = st33zp24_spi_recv,
}; };
static int st33zp24_spi_acpi_request_resources(struct st33zp24_spi_phy *phy) static int st33zp24_spi_acpi_request_resources(struct spi_device *spi_dev)
{ {
struct spi_device *spi_dev = phy->spi_device; struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
const struct acpi_device_id *id; const struct acpi_device_id *id;
struct gpio_desc *gpiod_lpcpd; struct gpio_desc *gpiod_lpcpd;
struct device *dev; struct device *dev;
@ -265,23 +265,23 @@ static int st33zp24_spi_acpi_request_resources(struct st33zp24_spi_phy *phy)
return 0; return 0;
} }
static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy) static int st33zp24_spi_of_request_resources(struct spi_device *spi_dev)
{ {
struct st33zp24_spi_phy *phy = spi_get_drvdata(spi_dev);
struct device_node *pp; struct device_node *pp;
struct spi_device *dev = phy->spi_device;
int gpio; int gpio;
int ret; int ret;
pp = dev->dev.of_node; pp = spi_dev->dev.of_node;
if (!pp) { if (!pp) {
dev_err(&dev->dev, "No platform data\n"); dev_err(&spi_dev->dev, "No platform data\n");
return -ENODEV; return -ENODEV;
} }
/* Get GPIO from device tree */ /* Get GPIO from device tree */
gpio = of_get_named_gpio(pp, "lpcpd-gpios", 0); gpio = of_get_named_gpio(pp, "lpcpd-gpios", 0);
if (gpio < 0) { if (gpio < 0) {
dev_err(&dev->dev, dev_err(&spi_dev->dev,
"Failed to retrieve lpcpd-gpios from dts.\n"); "Failed to retrieve lpcpd-gpios from dts.\n");
phy->io_lpcpd = -1; phy->io_lpcpd = -1;
/* /*
@ -292,10 +292,10 @@ static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
return 0; return 0;
} }
/* GPIO request and configuration */ /* GPIO request and configuration */
ret = devm_gpio_request_one(&dev->dev, gpio, ret = devm_gpio_request_one(&spi_dev->dev, gpio,
GPIOF_OUT_INIT_HIGH, "TPM IO LPCPD"); GPIOF_OUT_INIT_HIGH, "TPM IO LPCPD");
if (ret) { if (ret) {
dev_err(&dev->dev, "Failed to request lpcpd pin\n"); dev_err(&spi_dev->dev, "Failed to request lpcpd pin\n");
return -ENODEV; return -ENODEV;
} }
phy->io_lpcpd = gpio; phy->io_lpcpd = gpio;
@ -303,9 +303,9 @@ static int st33zp24_spi_of_request_resources(struct st33zp24_spi_phy *phy)
return 0; return 0;
} }
static int st33zp24_spi_request_resources(struct spi_device *dev, static int st33zp24_spi_request_resources(struct spi_device *dev)
struct st33zp24_spi_phy *phy)
{ {
struct st33zp24_spi_phy *phy = spi_get_drvdata(dev);
struct st33zp24_platform_data *pdata; struct st33zp24_platform_data *pdata;
int ret; int ret;
@ -357,17 +357,20 @@ static int st33zp24_spi_probe(struct spi_device *dev)
return -ENOMEM; return -ENOMEM;
phy->spi_device = dev; phy->spi_device = dev;
spi_set_drvdata(dev, phy);
pdata = dev->dev.platform_data; pdata = dev->dev.platform_data;
if (!pdata && dev->dev.of_node) { if (!pdata && dev->dev.of_node) {
ret = st33zp24_spi_of_request_resources(phy); ret = st33zp24_spi_of_request_resources(dev);
if (ret) if (ret)
return ret; return ret;
} else if (pdata) { } else if (pdata) {
ret = st33zp24_spi_request_resources(dev, phy); ret = st33zp24_spi_request_resources(dev);
if (ret) if (ret)
return ret; return ret;
} else if (ACPI_HANDLE(&dev->dev)) { } else if (ACPI_HANDLE(&dev->dev)) {
ret = st33zp24_spi_acpi_request_resources(phy); ret = st33zp24_spi_acpi_request_resources(dev);
if (ret) if (ret)
return ret; return ret;
} }