Skip to content

Commit b5bea8c

Browse files
committed
Merge branch 'for-6.19/cxl-misc' into cxl-for-next
- remove unused mock function for cxl_rcd_component_reg_phys()
2 parents 7ec9db6 + 26c5b0d commit b5bea8c

2 files changed

Lines changed: 0 additions & 18 deletions

File tree

tools/testing/cxl/Kbuild

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ ldflags-y += --wrap=acpi_pci_find_root
66
ldflags-y += --wrap=nvdimm_bus_register
77
ldflags-y += --wrap=cxl_await_media_ready
88
ldflags-y += --wrap=devm_cxl_add_rch_dport
9-
ldflags-y += --wrap=cxl_rcd_component_reg_phys
109
ldflags-y += --wrap=cxl_endpoint_parse_cdat
1110
ldflags-y += --wrap=cxl_dport_init_ras_reporting
1211
ldflags-y += --wrap=devm_cxl_endpoint_decoders_setup

tools/testing/cxl/test/mock.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -231,23 +231,6 @@ struct cxl_dport *__wrap_devm_cxl_add_rch_dport(struct cxl_port *port,
231231
}
232232
EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_add_rch_dport, "CXL");
233233

234-
resource_size_t __wrap_cxl_rcd_component_reg_phys(struct device *dev,
235-
struct cxl_dport *dport)
236-
{
237-
int index;
238-
resource_size_t component_reg_phys;
239-
struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);
240-
241-
if (ops && ops->is_mock_port(dev))
242-
component_reg_phys = CXL_RESOURCE_NONE;
243-
else
244-
component_reg_phys = cxl_rcd_component_reg_phys(dev, dport);
245-
put_cxl_mock_ops(index);
246-
247-
return component_reg_phys;
248-
}
249-
EXPORT_SYMBOL_NS_GPL(__wrap_cxl_rcd_component_reg_phys, "CXL");
250-
251234
void __wrap_cxl_endpoint_parse_cdat(struct cxl_port *port)
252235
{
253236
int index;

0 commit comments

Comments
 (0)