qiurui
/
linux-kernelorg-stable
mirror of https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cxl/core/regs: Rework cxl_map_pmu_regs() to use map->dev for devm 

struct cxl_register_map carries a @dev parameter for devm operations.
Simplify the function interface to use that instead of a separate @dev
argument.

Signed-off-by: Terry Bowman <terry.bowman@amd.com>
Signed-off-by: Robert Richter <rrichter@amd.com>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/r/20231018171713.1883517-21-rrichter@amd.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Robert Richter 2023-10-18 19:17:13 +02:00 committed by Dan Williams
parent d3970f006f
commit e8db070160
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/cxl/core/regs.c
View File

@ -386,10 +386,9 @@ int cxl_count_regblock(struct pci_dev *pdev, enum cxl_regloc_type type)
} }
EXPORT_SYMBOL_NS_GPL(cxl_count_regblock, CXL); EXPORT_SYMBOL_NS_GPL(cxl_count_regblock, CXL);
int cxl_map_pmu_regs(struct pci_dev *pdev, struct cxl_pmu_regs *regs, int cxl_map_pmu_regs(struct cxl_register_map *map, struct cxl_pmu_regs *regs)
struct cxl_register_map *map)
{ {
struct device *dev = &pdev->dev; struct device *dev = map->host;
resource_size_t phys_addr; resource_size_t phys_addr;
phys_addr = map->resource; phys_addr = map->resource;

3
drivers/cxl/cxl.h
View File

@ -286,8 +286,7 @@ int cxl_map_component_regs(const struct cxl_register_map *map,
unsigned long map_mask); unsigned long map_mask);
int cxl_map_device_regs(const struct cxl_register_map *map, int cxl_map_device_regs(const struct cxl_register_map *map,
struct cxl_device_regs *regs); struct cxl_device_regs *regs);
int cxl_map_pmu_regs(struct pci_dev *pdev, struct cxl_pmu_regs *regs, int cxl_map_pmu_regs(struct cxl_register_map *map, struct cxl_pmu_regs *regs);
struct cxl_register_map *map);
enum cxl_regloc_type; enum cxl_regloc_type;
int cxl_count_regblock(struct pci_dev *pdev, enum cxl_regloc_type type); int cxl_count_regblock(struct pci_dev *pdev, enum cxl_regloc_type type);

2
drivers/cxl/pci.c
View File

@ -898,7 +898,7 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
break; break;
} }
rc = cxl_map_pmu_regs(pdev, &pmu_regs, &map); rc = cxl_map_pmu_regs(&map, &pmu_regs);
if (rc) { if (rc) {
dev_dbg(&pdev->dev, "Could not map PMU regs\n"); dev_dbg(&pdev->dev, "Could not map PMU regs\n");
break; break;