PCI: cpqphp: Remove unused assignments

Remove variables and assignments that are never used.

Found by Krzysztof using cppcheck, e.g.:

  $ cppcheck --enable=all --force
  unreadVariable drivers/pci/hotplug/cpqphp_core.c:1257 Variable 'rc' is assigned a value that is never used.

Reported-by: Krzysztof Wilczyński <kw@linux.com>
Link: https://lore.kernel.org/r/20220313192933.434746-5-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/hotplug/cpqphp_core.c b/drivers/pci/hotplug/cpqphp_core.c
index f99a792..c94b40e 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_core.c
+++ b/drivers/pci/hotplug/cpqphp_core.c
@@ -1254,7 +1254,7 @@ static void __exit unload_cpqphpd(void)
        struct pci_resource *res;
        struct pci_resource *tres;
 
-       rc = compaq_nvram_store(cpqhp_rom_start);
+       compaq_nvram_store(cpqhp_rom_start);
 
        ctrl = cpqhp_ctrl_list;
 

diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index 93fd2a6..e429ecd 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -881,7 +881,6 @@ irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data)
        u8 reset;
        u16 misc;
        u32 Diff;
-       u32 temp_dword;
 
 
        misc = readw(ctrl->hpc_reg + MISC);
@@ -917,7 +916,7 @@ irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data)
                writel(Diff, ctrl->hpc_reg + INT_INPUT_CLEAR);
 
                /* Read it back to clear any posted writes */
-               temp_dword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR);
+               readl(ctrl->hpc_reg + INT_INPUT_CLEAR);
 
                if (!Diff)
                        /* Clear all interrupts */
@@ -1412,7 +1411,6 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl)
        u32 rc = 0;
        struct pci_func *new_slot = NULL;
        struct pci_bus *bus = ctrl->pci_bus;
-       struct slot *p_slot;
        struct resource_lists res_lists;
 
        hp_slot = func->device - ctrl->slot_device_offset;
@@ -1459,7 +1457,7 @@ static u32 board_added(struct pci_func *func, struct controller *ctrl)
        if (rc)
                return rc;
 
-       p_slot = cpqhp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
+       cpqhp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
        /* turn on board and blink green LED */
 
@@ -1614,7 +1612,6 @@ static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controll
        u8 device;
        u8 hp_slot;
        u8 temp_byte;
-       u32 rc;
        struct resource_lists res_lists;
        struct pci_func *temp_func;
 
@@ -1629,7 +1626,7 @@ static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controll
        /* When we get here, it is safe to change base address registers.
         * We will attempt to save the base address register lengths */
        if (replace_flag || !ctrl->add_support)
-               rc = cpqhp_save_base_addr_length(ctrl, func);
+               cpqhp_save_base_addr_length(ctrl, func);
        else if (!func->bus_head && !func->mem_head &&
                 !func->p_mem_head && !func->io_head) {
                /* Here we check to see if we've saved any of the board's
@@ -1647,7 +1644,7 @@ static u32 remove_board(struct pci_func *func, u32 replace_flag, struct controll
                }
 
                if (!skip)
-                       rc = cpqhp_save_used_resources(ctrl, func);
+                       cpqhp_save_used_resources(ctrl, func);
        }
        /* Change status to shutdown */
        if (func->is_a_board)
@@ -1767,7 +1764,7 @@ void cpqhp_event_stop_thread(void)
 
 static void interrupt_event_handler(struct controller *ctrl)
 {
-       int loop = 0;
+       int loop;
        int change = 1;
        struct pci_func *func;
        u8 hp_slot;
@@ -1885,7 +1882,6 @@ static void interrupt_event_handler(struct controller *ctrl)
 void cpqhp_pushbutton_thread(struct timer_list *t)
 {
        u8 hp_slot;
-       u8 device;
        struct pci_func *func;
        struct slot *p_slot = from_timer(p_slot, t, task_event);
        struct controller *ctrl = (struct controller *) p_slot->ctrl;
@@ -1893,8 +1889,6 @@ void cpqhp_pushbutton_thread(struct timer_list *t)
        pushbutton_pending = NULL;
        hp_slot = p_slot->hp_slot;
 
-       device = p_slot->device;
-
        if (is_slot_enabled(ctrl, hp_slot)) {
                p_slot->state = POWEROFF_STATE;
                /* power Down board */
@@ -1951,15 +1945,12 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func)
        u32 tempdword;
        int rc;
        struct slot *p_slot;
-       int physical_slot = 0;
 
        tempdword = 0;
 
        device = func->device;
        hp_slot = device - ctrl->slot_device_offset;
        p_slot = cpqhp_find_slot(ctrl, device);
-       if (p_slot)
-               physical_slot = p_slot->number;
 
        /* Check to see if the interlock is closed */
        tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR);
@@ -2043,13 +2034,10 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func)
        unsigned int devfn;
        struct slot *p_slot;
        struct pci_bus *pci_bus = ctrl->pci_bus;
-       int physical_slot = 0;
 
        device = func->device;
        func = cpqhp_slot_find(ctrl->bus, device, index++);
        p_slot = cpqhp_find_slot(ctrl, device);
-       if (p_slot)
-               physical_slot = p_slot->number;
 
        /* Make sure there are no video controllers here */
        while (func && !rc) {

diff --git a/drivers/pci/hotplug/cpqphp_pci.c b/drivers/pci/hotplug/cpqphp_pci.c
index 9038039..3b24842 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_pci.c
+++ b/drivers/pci/hotplug/cpqphp_pci.c
@@ -473,7 +473,7 @@ int cpqhp_save_slot_config(struct controller *ctrl, struct pci_func *new_slot)
        int sub_bus;
        int max_functions;
        int function = 0;
-       int cloop = 0;
+       int cloop;
        int stop_it;
 
        ID = 0xFFFFFFFF;