PCI: cpqphp: Cleanup and remove unreachable paths (3ecd9d01) · Commits · 戴 / test

drivers/pci/hotplug/cpqphp_ctrl.c

+20 −37

Original line number	Diff line number	Diff line
		@@ -1900,7 +1900,6 @@ static void interrupt_event_handler(struct controller *ctrl)
		dbg("power fault\n");
		} else {
		/* refresh notification */
		if (p_slot)
		update_slot_info(ctrl, p_slot);
		}

		@@ -2520,7 +2519,6 @@ static int configure_new_function(struct controller ctrl, struct pci_func func

		/* If we have IO resources copy them and fill in the bridge's
		* IO range registers */
		if (io_node) {
		memcpy(hold_IO_node, io_node, sizeof(struct pci_resource));
		io_node->next = NULL;

		@@ -2530,15 +2528,10 @@ static int configure_new_function(struct controller ctrl, struct pci_func func

		temp_byte = (io_node->base + io_node->length - 1) >> 8;
		rc = pci_bus_write_config_byte(pci_bus, devfn, PCI_IO_LIMIT, temp_byte);
		} else {
		kfree(hold_IO_node);
		hold_IO_node = NULL;
		}

		/* If we have memory resources copy them and fill in the
		* bridge's memory range registers. Otherwise, fill in the
		* range registers with values that disable them. */
		if (mem_node) {
		/* Copy the memory resources and fill in the bridge's memory
		* range registers.
		*/
		memcpy(hold_mem_node, mem_node, sizeof(struct pci_resource));
		mem_node->next = NULL;

		@@ -2548,16 +2541,6 @@ static int configure_new_function(struct controller ctrl, struct pci_func func

		temp_word = (mem_node->base + mem_node->length - 1) >> 16;
		rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);
		} else {
		temp_word = 0xFFFF;
		rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_BASE, temp_word);

		temp_word = 0x0000;
		rc = pci_bus_write_config_word(pci_bus, devfn, PCI_MEMORY_LIMIT, temp_word);

		kfree(hold_mem_node);
		hold_mem_node = NULL;
		}

		memcpy(hold_p_mem_node, p_mem_node, sizeof(struct pci_resource));
		p_mem_node->next = NULL;
		@@ -2627,7 +2610,7 @@ static int configure_new_function(struct controller ctrl, struct pci_func func
		/* Return unused bus resources
		* First use the temporary node to store information for
		* the board */
		if (hold_bus_node && bus_node && temp_resources.bus_head) {
		if (bus_node && temp_resources.bus_head) {
		hold_bus_node->length = bus_node->base - hold_bus_node->base;

		hold_bus_node->next = func->bus_head;
		@@ -2751,7 +2734,7 @@ static int configure_new_function(struct controller ctrl, struct pci_func func
		}
		/* If we have prefetchable memory space available and there
		* is some left at the end, return the unused portion */
		if (hold_p_mem_node && temp_resources.p_mem_head) {
		if (temp_resources.p_mem_head) {
		p_mem_node = do_pre_bridge_resource_split(&(temp_resources.p_mem_head),
		&hold_p_mem_node, 0x100000);

Admin message