Commit b5bea8ce authored by Dave Jiang's avatar Dave Jiang
Browse files

Merge branch 'for-6.19/cxl-misc' into cxl-for-next 

- remove unused mock function for cxl_rcd_component_reg_phys()
parents 7ec9db66 26c5b0d9

tools/testing/cxl/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ ldflags-y += --wrap=acpi_pci_find_root 
ldflags-y += --wrap=nvdimm_bus_register

ldflags-y += --wrap=cxl_await_media_ready

ldflags-y += --wrap=devm_cxl_add_rch_dport

ldflags-y += --wrap=cxl_rcd_component_reg_phys

ldflags-y += --wrap=cxl_endpoint_parse_cdat

ldflags-y += --wrap=cxl_dport_init_ras_reporting

ldflags-y += --wrap=devm_cxl_endpoint_decoders_setup

tools/testing/cxl/test/mock.c

+0 −17
Original line number Diff line number Diff line
@@ -231,23 +231,6 @@ struct cxl_dport *__wrap_devm_cxl_add_rch_dport(struct cxl_port *port, 
}

EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_add_rch_dport, "CXL");



resource_size_t __wrap_cxl_rcd_component_reg_phys(struct device *dev,

						  struct cxl_dport *dport)

{

	int index;

	resource_size_t component_reg_phys;

	struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);



	if (ops && ops->is_mock_port(dev))

		component_reg_phys = CXL_RESOURCE_NONE;

	else

		component_reg_phys = cxl_rcd_component_reg_phys(dev, dport);

	put_cxl_mock_ops(index);



	return component_reg_phys;

}

EXPORT_SYMBOL_NS_GPL(__wrap_cxl_rcd_component_reg_phys, "CXL");



void __wrap_cxl_endpoint_parse_cdat(struct cxl_port *port)

{

	int index;