Commit 08795f4c authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Remove unused config functions 



mpt3sas_config_get_manufacturing_pg7() and
mpt3sas_config_get_sas_device_pg1() were added as part of 2012's
commit f92363d1 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
but haven't been used.

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Link: https://lore.kernel.org/r/20250127002851.113711-1-linux@treblig.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent b932ff7d

drivers/scsi/mpt3sas/mpt3sas_base.h

+0 −6
Original line number Diff line number Diff line
@@ -1858,9 +1858,6 @@ int mpt3sas_config_get_manufacturing_pg0(struct MPT3SAS_ADAPTER *ioc, 
int mpt3sas_config_get_manufacturing_pg1(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage1_t *config_page);



int mpt3sas_config_get_manufacturing_pg7(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage7_t *config_page,

	u16 sz);

int mpt3sas_config_get_manufacturing_pg10(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply,

	struct Mpi2ManufacturingPage10_t *config_page);
@@ -1887,9 +1884,6 @@ int mpt3sas_config_get_iounit_pg0(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigReply_t 
int mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage0_t *config_page,

	u32 form, u32 handle);

int mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page,

	u32 form, u32 handle);

int mpt3sas_config_get_pcie_device_pg0(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi26PCIeDevicePage0_t *config_page,

	u32 form, u32 handle);

drivers/scsi/mpt3sas/mpt3sas_config.c

+0 −79
Original line number Diff line number Diff line
@@ -576,44 +576,6 @@ mpt3sas_config_get_manufacturing_pg1(struct MPT3SAS_ADAPTER *ioc, 
	return r;

}



/**

 * mpt3sas_config_get_manufacturing_pg7 - obtain manufacturing page 7

 * @ioc: per adapter object

 * @mpi_reply: reply mf payload returned from firmware

 * @config_page: contents of the config page

 * @sz: size of buffer passed in config_page

 * Context: sleep.

 *

 * Return: 0 for success, non-zero for failure.

 */

int

mpt3sas_config_get_manufacturing_pg7(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage7_t *config_page,

	u16 sz)

{

	Mpi2ConfigRequest_t mpi_request;

	int r;



	memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t));

	mpi_request.Function = MPI2_FUNCTION_CONFIG;

	mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_HEADER;

	mpi_request.Header.PageType = MPI2_CONFIG_PAGETYPE_MANUFACTURING;

	mpi_request.Header.PageNumber = 7;

	mpi_request.Header.PageVersion = MPI2_MANUFACTURING7_PAGEVERSION;

	ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE);

	r = _config_request(ioc, &mpi_request, mpi_reply,

	    MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0);

	if (r)

		goto out;



	mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT;

	r = _config_request(ioc, &mpi_request, mpi_reply,

	    MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page,

	    sz);

 out:

	return r;

}



/**

 * mpt3sas_config_get_manufacturing_pg10 - obtain manufacturing page 10

 * @ioc: per adapter object
@@ -1213,47 +1175,6 @@ mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc, 
	return r;

}



/**

 * mpt3sas_config_get_sas_device_pg1 - obtain sas device page 1

 * @ioc: per adapter object

 * @mpi_reply: reply mf payload returned from firmware

 * @config_page: contents of the config page

 * @form: GET_NEXT_HANDLE or HANDLE

 * @handle: device handle

 * Context: sleep.

 *

 * Return: 0 for success, non-zero for failure.

 */

int

mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc,

	Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page,

	u32 form, u32 handle)

{

	Mpi2ConfigRequest_t mpi_request;

	int r;



	memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t));

	mpi_request.Function = MPI2_FUNCTION_CONFIG;

	mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_HEADER;

	mpi_request.Header.PageType = MPI2_CONFIG_PAGETYPE_EXTENDED;

	mpi_request.ExtPageType = MPI2_CONFIG_EXTPAGETYPE_SAS_DEVICE;

	mpi_request.Header.PageVersion = MPI2_SASDEVICE1_PAGEVERSION;

	mpi_request.Header.PageNumber = 1;

	ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE);

	r = _config_request(ioc, &mpi_request, mpi_reply,

	    MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0);

	if (r)

		goto out;



	mpi_request.PageAddress = cpu_to_le32(form | handle);

	mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT;

	r = _config_request(ioc, &mpi_request, mpi_reply,

	    MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page,

	    sizeof(*config_page));

 out:

	return r;

}



/**

 * mpt3sas_config_get_pcie_device_pg0 - obtain pcie device page 0

 * @ioc: per adapter object