mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
PCI: make pci_restore_state return void
pci_restore_state only ever returns 0, thus there is no benefit in having it return any value. Also, a large majority of the callers do not check the return code of pci_restore_state. Make the pci_restore_state a void return and avoid the overhead. Acked-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Jon Mason <[email protected]> Signed-off-by: Jesse Barnes <[email protected]>
This commit is contained in:
parent
2f671e2dbf
commit
1d3c16a818
13 changed files with 22 additions and 66 deletions
|
|
@ -7487,16 +7487,10 @@ static int ipr_reset_restore_cfg_space(struct ipr_cmnd *ipr_cmd)
|
|||
{
|
||||
struct ipr_ioa_cfg *ioa_cfg = ipr_cmd->ioa_cfg;
|
||||
volatile u32 int_reg;
|
||||
int rc;
|
||||
|
||||
ENTER;
|
||||
ioa_cfg->pdev->state_saved = true;
|
||||
rc = pci_restore_state(ioa_cfg->pdev);
|
||||
|
||||
if (rc != PCIBIOS_SUCCESSFUL) {
|
||||
ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
|
||||
return IPR_RC_JOB_CONTINUE;
|
||||
}
|
||||
pci_restore_state(ioa_cfg->pdev);
|
||||
|
||||
if (ipr_set_pcix_cmd_reg(ioa_cfg)) {
|
||||
ipr_cmd->s.ioasa.hdr.ioasc = cpu_to_be32(IPR_IOASC_PCI_ACCESS_ERROR);
|
||||
|
|
|
|||
|
|
@ -2228,12 +2228,7 @@ static void pmcraid_ioa_reset(struct pmcraid_cmd *cmd)
|
|||
/* Once either bist or pci reset is done, restore PCI config
|
||||
* space. If this fails, proceed with hard reset again
|
||||
*/
|
||||
if (pci_restore_state(pinstance->pdev)) {
|
||||
pmcraid_info("config-space error resetting again\n");
|
||||
pinstance->ioa_state = IOA_STATE_IN_RESET_ALERT;
|
||||
pmcraid_reset_alert(cmd);
|
||||
break;
|
||||
}
|
||||
pci_restore_state(pinstance->pdev);
|
||||
|
||||
/* fail all pending commands */
|
||||
pmcraid_fail_outstanding_cmds(pinstance);
|
||||
|
|
|
|||
Loading…
Reference in a new issue