PCI: Remove unused assignments
Subsystems (4)
cover PCI: Remove unused assignments
From: Bjorn Helgaas <[email protected]>
Krzysztof pointed out several unused variables and unnecessary assignments. Clean up some of them.
Bjorn Helgaas (5):
PCI: Remove unused assignments
PCI: kirin: Remove unused assignments
PCI: fu740: Remove unused assignments
PCI: cpqphp: Remove unused assignments
PCI: ibmphp: Remove unused assignments
drivers/pci/controller/dwc/pcie-fu740.c | 2 +- drivers/pci/controller/dwc/pcie-kirin.c | 3 --- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_ctrl.c | 22 +++++----------------- drivers/pci/hotplug/cpqphp_pci.c | 2 +- drivers/pci/hotplug/ibmphp_hpc.c | 2 -- drivers/pci/hotplug/ibmphp_res.c | 3 +-- drivers/pci/pci-sysfs.c | 7 +------ drivers/pci/proc.c | 4 ---- drivers/pci/setup-bus.c | 2 +- 10 files changed, 11 insertions(+), 38 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/5 PCI: Remove unused assignments
From: Bjorn Helgaas <[email protected]>
Remove variables and assignments that are never used.
Found by Krzysztof Wilczyński <[email protected]> using cppcheck, e.g.,
$ cppcheck --enable=all --force uselessAssignmentPtrArg drivers/pci/proc.c:102 Assignment of function parameter has no effect outside the function. Did you forget dereferencing it? unreadVariable drivers/pci/setup-bus.c:1528 Variable 'old_flags' is assigned a value that is never used.
--- drivers/pci/pci-sysfs.c | 7 +------ drivers/pci/proc.c | 4 ---- drivers/pci/setup-bus.c | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-)
drivers/pci/pci-sysfs.c +1 -6
@@ -754,8 +754,6 @@ static ssize_t pci_read_config(struct file *filp, struct kobject *kobj,u8 val;pci_user_read_config_byte (dev, off, &val); data[off - init_off] = val; - off++; - --size; }pci_config_pm_runtime_put (dev);
@@ -818,11 +816,8 @@ static ssize_t pci_write_config(struct file *filp, struct kobject *kobj, size -=2 ; } -if (size) { +if (size)pci_user_write_config_byte (dev, off, data[off - init_off]); - off++; - --size; - }pci_config_pm_runtime_put (dev);
drivers/pci/proc.c +0 -4
@@ -99,9 +99,7 @@ static ssize_t proc_bus_pci_read(struct file *file, char __user *buf,unsigned char val;pci_user_read_config_byte (dev, pos, &val);__put_user (val, buf); - buf++; pos++; - cnt--; }pci_config_pm_runtime_put (dev);
@@ -176,9 +174,7 @@ static ssize_t proc_bus_pci_write(struct file *file, const char __user *buf,unsigned char val;__get_user (val, buf);pci_user_write_config_byte (dev, pos, val); - buf++; pos++; - cnt--; }pci_config_pm_runtime_put (dev);
drivers/pci/setup-bus.c +1 -1
@@ -1525,7 +1525,7 @@ static void pci_bridge_release_resources(struct pci_bus *bus, {struct pci_dev *dev = bus->self;struct resource *r; -unsigned int old_flags =0 ; +unsigned int old_flags;struct resource *b_res;int idx =1 ;
Signature · 1 line
2.25.1
PATCH 2/5 PCI: kirin: Remove unused assignments
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
hi3660_pcie_phy_init() assigned "pdev", but never used the value. Drop it.
Found by Krzysztof Wilczyński <[email protected]> using cppcheck:
$ cppcheck --enable=all --force unreadVariable drivers/pci/controller/dwc/pcie-kirin.c:336 Variable 'pdev' is assigned a value that is never used.
--- drivers/pci/controller/dwc/pcie-kirin.c | 3 --- 1 file changed, 3 deletions(-)
drivers/pci/controller/dwc/pcie-kirin.c +0 -3
@@ -332,9 +332,6 @@ static int hi3660_pcie_phy_init(struct platform_device *pdev, pcie->phy_priv = phy; phy->dev = dev; -/* registers */ - pdev = container_of(dev, struct platform_device, dev); - ret =hi3660_pcie_phy_get_clk (phy);if (ret)return ret;
Signature · 1 line
2.25.1
PATCH 3/5 PCI: fu740: Remove unused assignments
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
fu740_pcie_host_init() assigned "ret", but never used the value. Drop it.
Found by Krzysztof Wilczyński <[email protected]> using cppcheck:
$ cppcheck --enable=all --force unreadVariable drivers/pci/controller/dwc/pcie-fu740.c:227 Variable 'ret' is assigned a value that is never used.
--- drivers/pci/controller/dwc/pcie-fu740.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-fu740.c +1 -1
@@ -224,7 +224,7 @@ static int fu740_pcie_host_init(struct pcie_port *pp)/* Clear hold_phy_rst */ writel_relaxed (0x0 , afp->mgmt_base +PCIEX8MGMT_APP_HOLD_PHY_RST );/* Enable pcieauxclk */ - ret =clk_prepare_enable (afp->pcie_aux); +clk_prepare_enable (afp->pcie_aux);/* Set RC mode */ writel_relaxed (0x4 , afp->mgmt_base +PCIEX8MGMT_DEVICE_TYPE );
Signature · 1 line
2.25.1
PATCH 4/5 PCI: cpqphp: Remove unused assignments
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Remove variables and assignments that are never used.
Found by Krzysztof Wilczyński <[email protected]> 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.
--- drivers/pci/hotplug/cpqphp_core.c | 2 +- drivers/pci/hotplug/cpqphp_ctrl.c | 22 +++++----------------- drivers/pci/hotplug/cpqphp_pci.c | 2 +- 3 files changed, 7 insertions(+), 19 deletions(-)
drivers/pci/hotplug/cpqphp_core.c +1 -1
@@ -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;
drivers/pci/hotplug/cpqphp_ctrl.c +5 -17
@@ -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 controllu8 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) {
drivers/pci/hotplug/cpqphp_pci.c +1 -1
@@ -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 ;
Signature · 1 line
2.25.1
PATCH 5/5 PCI: ibmphp: Remove unused assignments
In reply to Bjorn HelgaasFrom: Bjorn Helgaas <[email protected]>
Remove variables and assignments that are never used.
Found by Krzysztof Wilczyński <[email protected]> using cppcheck, e.g.:
$ cppcheck --enable=all --force unreadVariable drivers/pci/hotplug/ibmphp_res.c:1958 Variable 'bus_sec' is assigned a value that is never used.
--- drivers/pci/hotplug/ibmphp_hpc.c | 2 -- drivers/pci/hotplug/ibmphp_res.c | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-)
drivers/pci/hotplug/ibmphp_hpc.c +0 -2
@@ -325,11 +325,9 @@ static u8 i2c_ctrl_write(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8static u8 isa_ctrl_read (struct controller *ctlr_ptr,u8 offset) {u16 start_address; -u16 end_address;u8 data; start_address = ctlr_ptr->u.isa_ctlr.io_start; - end_address = ctlr_ptr->u.isa_ctlr.io_end; data =inb (start_address + offset);return data; }
drivers/pci/hotplug/ibmphp_res.c +1 -2
@@ -1955,7 +1955,7 @@ static int __init update_bridge_ranges(struct bus_node **bus) bus_sec =find_bus_wprev (sec_busno,NULL ,0 );/* this bus structure doesn't exist yet, PPB was configured during previous loading of ibmphp */ if (!bus_sec) { - bus_sec =alloc_error_bus (NULL , sec_busno,1 ); +alloc_error_bus (NULL , sec_busno,1 );/* the rest will be populated during NVRAM call */ return 0 ; }
@@ -2114,6 +2114,5 @@ static int __init update_bridge_ranges(struct bus_node **bus) }/* end for function */ }/* end for device */ - bus = &bus_cur;return 0 ; }
Signature · 1 line
2.25.1