Skip to content

Commit 08795f4

Browse files
Dr. David Alan Gilbertmartinkpetersen
authored andcommitted
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 f92363d ("[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>
1 parent b932ff7 commit 08795f4

File tree

2 files changed

+0
-85
lines changed

2 files changed

+0
-85
lines changed

drivers/scsi/mpt3sas/mpt3sas_base.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1858,9 +1858,6 @@ int mpt3sas_config_get_manufacturing_pg0(struct MPT3SAS_ADAPTER *ioc,
18581858
int mpt3sas_config_get_manufacturing_pg1(struct MPT3SAS_ADAPTER *ioc,
18591859
Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage1_t *config_page);
18601860

1861-
int mpt3sas_config_get_manufacturing_pg7(struct MPT3SAS_ADAPTER *ioc,
1862-
Mpi2ConfigReply_t *mpi_reply, Mpi2ManufacturingPage7_t *config_page,
1863-
u16 sz);
18641861
int mpt3sas_config_get_manufacturing_pg10(struct MPT3SAS_ADAPTER *ioc,
18651862
Mpi2ConfigReply_t *mpi_reply,
18661863
struct Mpi2ManufacturingPage10_t *config_page);
@@ -1887,9 +1884,6 @@ int mpt3sas_config_get_iounit_pg0(struct MPT3SAS_ADAPTER *ioc, Mpi2ConfigReply_t
18871884
int mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc,
18881885
Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage0_t *config_page,
18891886
u32 form, u32 handle);
1890-
int mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc,
1891-
Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page,
1892-
u32 form, u32 handle);
18931887
int mpt3sas_config_get_pcie_device_pg0(struct MPT3SAS_ADAPTER *ioc,
18941888
Mpi2ConfigReply_t *mpi_reply, Mpi26PCIeDevicePage0_t *config_page,
18951889
u32 form, u32 handle);

drivers/scsi/mpt3sas/mpt3sas_config.c

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -576,44 +576,6 @@ mpt3sas_config_get_manufacturing_pg1(struct MPT3SAS_ADAPTER *ioc,
576576
return r;
577577
}
578578

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-
617579
/**
618580
* mpt3sas_config_get_manufacturing_pg10 - obtain manufacturing page 10
619581
* @ioc: per adapter object
@@ -1213,47 +1175,6 @@ mpt3sas_config_get_sas_device_pg0(struct MPT3SAS_ADAPTER *ioc,
12131175
return r;
12141176
}
12151177

1216-
/**
1217-
* mpt3sas_config_get_sas_device_pg1 - obtain sas device page 1
1218-
* @ioc: per adapter object
1219-
* @mpi_reply: reply mf payload returned from firmware
1220-
* @config_page: contents of the config page
1221-
* @form: GET_NEXT_HANDLE or HANDLE
1222-
* @handle: device handle
1223-
* Context: sleep.
1224-
*
1225-
* Return: 0 for success, non-zero for failure.
1226-
*/
1227-
int
1228-
mpt3sas_config_get_sas_device_pg1(struct MPT3SAS_ADAPTER *ioc,
1229-
Mpi2ConfigReply_t *mpi_reply, Mpi2SasDevicePage1_t *config_page,
1230-
u32 form, u32 handle)
1231-
{
1232-
Mpi2ConfigRequest_t mpi_request;
1233-
int r;
1234-
1235-
memset(&mpi_request, 0, sizeof(Mpi2ConfigRequest_t));
1236-
mpi_request.Function = MPI2_FUNCTION_CONFIG;
1237-
mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_HEADER;
1238-
mpi_request.Header.PageType = MPI2_CONFIG_PAGETYPE_EXTENDED;
1239-
mpi_request.ExtPageType = MPI2_CONFIG_EXTPAGETYPE_SAS_DEVICE;
1240-
mpi_request.Header.PageVersion = MPI2_SASDEVICE1_PAGEVERSION;
1241-
mpi_request.Header.PageNumber = 1;
1242-
ioc->build_zero_len_sge_mpi(ioc, &mpi_request.PageBufferSGE);
1243-
r = _config_request(ioc, &mpi_request, mpi_reply,
1244-
MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, NULL, 0);
1245-
if (r)
1246-
goto out;
1247-
1248-
mpi_request.PageAddress = cpu_to_le32(form | handle);
1249-
mpi_request.Action = MPI2_CONFIG_ACTION_PAGE_READ_CURRENT;
1250-
r = _config_request(ioc, &mpi_request, mpi_reply,
1251-
MPT3_CONFIG_PAGE_DEFAULT_TIMEOUT, config_page,
1252-
sizeof(*config_page));
1253-
out:
1254-
return r;
1255-
}
1256-
12571178
/**
12581179
* mpt3sas_config_get_pcie_device_pg0 - obtain pcie device page 0
12591180
* @ioc: per adapter object

0 commit comments

Comments
 (0)