1 files changed, 0 insertions, 112 deletions

diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index 164375eea896..330c29080e3c 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -1188,7 +1188,6 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id)
         ioc->pcidev = pdev;
         ioc->diagPending = 0;
         spin_lock_init(&ioc->diagLock);
-        spin_lock_init(&ioc->fc_rescan_work_lock);
         spin_lock_init(&ioc->initializing_hba_lock);
 
         /* Initialize the event logging.
@@ -1847,14 +1846,6 @@ mpt_do_ioc_recovery(MPT_ADAPTER *ioc, u32 reason, int sleepFlag)
                         mpt_findImVolumes(ioc);
 
                 } else if (ioc->bus_type == FC) {
-                        /*
-                         *  Pre-fetch FC port WWN and stuff...
-                         *  (FCPortPage0_t stuff)
-                         */
-                        for (ii=0; ii < ioc->facts.NumberOfPorts; ii++) {
-                                (void) mptbase_GetFcPortPage0(ioc, ii);
-                        }
-
                         if ((ioc->pfacts[0].ProtocolFlags & MPI_PORTFACTS_PROTOCOL_LAN) &&
                             (ioc->lan_cnfg_page0.Header.PageLength == 0)) {
                                 /*
@@ -4186,108 +4177,6 @@ GetLanConfigPages(MPT_ADAPTER *ioc)
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
 /*
- *      mptbase_GetFcPortPage0 - Fetch FCPort config Page0.
- *      @ioc: Pointer to MPT_ADAPTER structure
- *      @portnum: IOC Port number
- *
- *      Return: 0 for success
- *      -ENOMEM if no memory available
- *              -EPERM if not allowed due to ISR context
- *              -EAGAIN if no msg frames currently available
- *              -EFAULT for non-successful reply or no reply (timeout)
- */
-int
-mptbase_GetFcPortPage0(MPT_ADAPTER *ioc, int portnum)
-{
-        ConfigPageHeader_t       hdr;
-        CONFIGPARMS              cfg;
-        FCPortPage0_t           *ppage0_alloc;
-        FCPortPage0_t           *pp0dest;
-        dma_addr_t               page0_dma;
-        int                      data_sz;
-        int                      copy_sz;
-        int                      rc;
-        int                      count = 400;
-
-
-        /* Get FCPort Page 0 header */
-        hdr.PageVersion = 0;
-        hdr.PageLength = 0;
-        hdr.PageNumber = 0;
-        hdr.PageType = MPI_CONFIG_PAGETYPE_FC_PORT;
-        cfg.cfghdr.hdr = &hdr;
-        cfg.physAddr = -1;
-        cfg.action = MPI_CONFIG_ACTION_PAGE_HEADER;
-        cfg.dir = 0;
-        cfg.pageAddr = portnum;
-        cfg.timeout = 0;
-
-        if ((rc = mpt_config(ioc, &cfg)) != 0)
-                return rc;
-
-        if (hdr.PageLength == 0)
-                return 0;
-
-        data_sz = hdr.PageLength * 4;
-        rc = -ENOMEM;
-        ppage0_alloc = (FCPortPage0_t *) pci_alloc_consistent(ioc->pcidev, data_sz, &page0_dma);
-        if (ppage0_alloc) {
-
- try_again:
-                memset((u8 *)ppage0_alloc, 0, data_sz);
-                cfg.physAddr = page0_dma;
-                cfg.action = MPI_CONFIG_ACTION_PAGE_READ_CURRENT;
-
-                if ((rc = mpt_config(ioc, &cfg)) == 0) {
-                        /* save the data */
-                        pp0dest = &ioc->fc_port_page0[portnum];
-                        copy_sz = min_t(int, sizeof(FCPortPage0_t), data_sz);
-                        memcpy(pp0dest, ppage0_alloc, copy_sz);
-
-                        /*
-                         *      Normalize endianness of structure data,
-                         *      by byte-swapping all > 1 byte fields!
-                         */
-                        pp0dest->Flags = le32_to_cpu(pp0dest->Flags);
-                        pp0dest->PortIdentifier = le32_to_cpu(pp0dest->PortIdentifier);
-                        pp0dest->WWNN.Low = le32_to_cpu(pp0dest->WWNN.Low);
-                        pp0dest->WWNN.High = le32_to_cpu(pp0dest->WWNN.High);
-                        pp0dest->WWPN.Low = le32_to_cpu(pp0dest->WWPN.Low);
-                        pp0dest->WWPN.High = le32_to_cpu(pp0dest->WWPN.High);
-                        pp0dest->SupportedServiceClass = le32_to_cpu(pp0dest->SupportedServiceClass);
-                        pp0dest->SupportedSpeeds = le32_to_cpu(pp0dest->SupportedSpeeds);
-                        pp0dest->CurrentSpeed = le32_to_cpu(pp0dest->CurrentSpeed);
-                        pp0dest->MaxFrameSize = le32_to_cpu(pp0dest->MaxFrameSize);
-                        pp0dest->FabricWWNN.Low = le32_to_cpu(pp0dest->FabricWWNN.Low);
-                        pp0dest->FabricWWNN.High = le32_to_cpu(pp0dest->FabricWWNN.High);
-                        pp0dest->FabricWWPN.Low = le32_to_cpu(pp0dest->FabricWWPN.Low);
-                        pp0dest->FabricWWPN.High = le32_to_cpu(pp0dest->FabricWWPN.High);
-                        pp0dest->DiscoveredPortsCount = le32_to_cpu(pp0dest->DiscoveredPortsCount);
-                        pp0dest->MaxInitiators = le32_to_cpu(pp0dest->MaxInitiators);
-
-                        /*
-                         * if still doing discovery,
-                         * hang loose a while until finished
-                         */
-                        if (pp0dest->PortState == MPI_FCPORTPAGE0_PORTSTATE_UNKNOWN) {
-                                if (count-- > 0) {
-                                        msleep_interruptible(100);
-                                        goto try_again;
-                                }
-                                printk(MYIOC_s_INFO_FMT "Firmware discovery not"
-                                                        " complete.\n",
-                                                ioc->name);
-                        }
-                }
-
-                pci_free_consistent(ioc->pcidev, data_sz, (u8 *) ppage0_alloc, page0_dma);
-        }
-
-        return rc;
-}
-
-/*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/
-/*
  *      mptbase_sas_persist_operation - Perform operation on SAS Persitent Table
  *      @ioc: Pointer to MPT_ADAPTER structure
  *      @sas_address: 64bit SAS Address for operation.
@@ -6495,7 +6384,6 @@ EXPORT_SYMBOL(mpt_findImVolumes);
 EXPORT_SYMBOL(mpt_alloc_fw_memory);
 EXPORT_SYMBOL(mpt_free_fw_memory);
 EXPORT_SYMBOL(mptbase_sas_persist_operation);
-EXPORT_SYMBOL(mptbase_GetFcPortPage0);
 
 
 /*=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=*/