2023-09-26 23:16:55

by srinivas pandruvada

[permalink] [raw]
Subject: [PATCH] platform/x86: intel_speed_select_if: Use devm_ioremap_resource

Replace devm_ioremap() with devm_ioremap_resource() by defining a
resource.

No functional impact is expected.

Suggested-by: Andriy Shevchenko <[email protected]>
Signed-off-by: Srinivas Pandruvada <[email protected]>
---
This patch requires merge of series "Minor SST optimizations",
particularly
platform/x86: intel_speed_select_if: Remove hardcoded map size
Can be differed to 6.8 cycle.
If I repost the series after reviews, I will include as part of the
series.

.../platform/x86/intel/speed_select_if/isst_if_mmio.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c b/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
index 13e068c77d50..3f4343147dad 100644
--- a/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
+++ b/drivers/platform/x86/intel/speed_select_if/isst_if_mmio.c
@@ -94,6 +94,7 @@ static int isst_if_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct isst_if_device *punit_dev;
struct isst_if_cmd_cb cb;
u32 mmio_base, pcu_base;
+ struct resource r;
u64 base_addr;
int ret;

@@ -118,10 +119,10 @@ static int isst_if_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

punit_dev->mmio_range = (struct isst_mmio_range *) ent->driver_data;

- punit_dev->punit_mmio = devm_ioremap(&pdev->dev, base_addr,
- punit_dev->mmio_range[1].size);
- if (!punit_dev->punit_mmio)
- return -ENOMEM;
+ r = DEFINE_RES_MEM(base_addr, punit_dev->mmio_range[1].size);
+ punit_dev->punit_mmio = devm_ioremap_resource(&pdev->dev, &r);
+ if (IS_ERR(punit_dev->punit_mmio))
+ return PTR_ERR(punit_dev->punit_mmio);

mutex_init(&punit_dev->mutex);
pci_set_drvdata(pdev, punit_dev);
--
2.41.0