tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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 f92363d12359 ("[SCSI] mpt3sas: add new driver supporting 12GB SAS")
but haven't been used.

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Link: https://lore.kernel.org/r/20250127002851.113711-1-linux@treblig.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

authored by

Dr. David Alan Gilbert and committed by
Martin K. Petersen 08795f4c b932ff7d

-85
-6
drivers/scsi/mpt3sas/mpt3sas_base.h
··· 1858 1858 int mpt3sas_config_get_manufacturing_pg1(struct MPT3SAS_ADAPTER *ioc, 1859 1859 Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage1_t *config_page); 1860 1860 1861 - int mpt3sas_config_get_manufacturing_pg7(struct MPT3SAS_ADAPTER *ioc, 1862 - Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage7_t *config_page, 1863 - u16 sz); 1864 1861 int mpt3sas_config_get_manufacturing_pg10(struct MPT3SAS_ADAPTER *ioc, 1865 1862 Mpi2ConfigReply_t *mpi_reply, 1866 1863 struct Mpi2ManufacturingPage10_t *config_page); ··· 1883 1886 *mpi_reply, Mpi2IOUnitPage0_t *config_page); 1884 1887 int mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc, 1885 1888 Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage0_t *config_page, 1886 - u32 form, u32 handle); 1887 - int mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc, 1888 - Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page, 1889 1889 u32 form, u32 handle); 1890 1890 int mpt3sas_config_get_pcie_device_pg0(struct MPT3SAS_ADAPTER *ioc, 1891 1891 Mpi2ConfigReply_t *mpi_reply, Mpi26PCIeDevicePage0_t *config_page,
-79
drivers/scsi/mpt3sas/mpt3sas_config.c
··· 577 577 } 578 578 579 579 /** 580 - * mpt3sas_config_get_manufacturing_pg7 - obtain manufacturing page 7 581 - * @ioc: per adapter object 582 - * @mpi_reply: reply mf payload returned from firmware 583 - * @config_page: contents of the config page 584 - * @sz: size of buffer passed in config_page 585 - * Context: sleep. 586 - * 587 - * Return: 0 for success, non-zero for failure. 588 - */ 589 - int 590 - mpt3sas_config_get_manufacturing_pg7(struct MPT3SAS_ADAPTER *ioc, 591 - Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage7_t *config_page, 592 - u16 sz) 593 - { 594 - Mpi2ConfigRequest_t mpi_request; 595 - int r; 596 - 597 - memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t)); 598 - mpi_request.Function = MPI2_FUNCTION_CONFIG; 599 - mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_HEADER; 600 - mpi_request.Header.PageType = MPI2_CONFIG_PAGETYPE_MANUFACTURING; 601 - mpi_request.Header.PageNumber = 7; 602 - mpi_request.Header.PageVersion = MPI2_MANUFACTURING7_PAGEVERSION; 603 - ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE); 604 - r = _config_request(ioc, &mpi_request, mpi_reply, 605 - MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0); 606 - if (r) 607 - goto out; 608 - 609 - mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT; 610 - r = _config_request(ioc, &mpi_request, mpi_reply, 611 - MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page, 612 - sz); 613 - out: 614 - return r; 615 - } 616 - 617 - /** 618 580 * mpt3sas_config_get_manufacturing_pg10 - obtain manufacturing page 10 619 581 * @ioc: per adapter object 620 582 * @mpi_reply: reply mf payload returned from firmware ··· 1160 1198 mpi_request.ExtPageType = MPI2_CONFIG_EXTPAGETYPE_SAS_DEVICE; 1161 1199 mpi_request.Header.PageVersion = MPI2_SASDEVICE0_PAGEVERSION; 1162 1200 mpi_request.Header.PageNumber = 0; 1163 - ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE); 1164 - r = _config_request(ioc, &mpi_request, mpi_reply, 1165 - MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0); 1166 - if (r) 1167 - goto out; 1168 - 1169 - mpi_request.PageAddress = cpu_to_le32(form | handle); 1170 - mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT; 1171 - r = _config_request(ioc, &mpi_request, mpi_reply, 1172 - MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page, 1173 - sizeof(*config_page)); 1174 - out: 1175 - return r; 1176 - } 1177 - 1178 - /** 1179 - * mpt3sas_config_get_sas_device_pg1 - obtain sas device page 1 1180 - * @ioc: per adapter object 1181 - * @mpi_reply: reply mf payload returned from firmware 1182 - * @config_page: contents of the config page 1183 - * @form: GET_NEXT_HANDLE or HANDLE 1184 - * @handle: device handle 1185 - * Context: sleep. 1186 - * 1187 - * Return: 0 for success, non-zero for failure. 1188 - */ 1189 - int 1190 - mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc, 1191 - Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page, 1192 - u32 form, u32 handle) 1193 - { 1194 - Mpi2ConfigRequest_t mpi_request; 1195 - int r; 1196 - 1197 - memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t)); 1198 - mpi_request.Function = MPI2_FUNCTION_CONFIG; 1199 - mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_HEADER; 1200 - mpi_request.Header.PageType = MPI2_CONFIG_PAGETYPE_EXTENDED; 1201 - mpi_request.ExtPageType = MPI2_CONFIG_EXTPAGETYPE_SAS_DEVICE; 1202 - mpi_request.Header.PageVersion = MPI2_SASDEVICE1_PAGEVERSION; 1203 - mpi_request.Header.PageNumber = 1; 1204 1201 ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE); 1205 1202 r = _config_request(ioc, &mpi_request, mpi_reply, 1206 1203 MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0);