Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/ab8500...

[firefly-linux-kernel-4.4.55.git] / drivers / pci / pcie / aer / aer_inject.c

diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 587e7e853107136b81f416d0e1e932db855bfa61..182224acedbe79c18dbc357cb45763afef40e387 100644 (file)
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -397,16 +397,14 @@ static int aer_inject(struct aer_error_inj *einj)
        if (!aer_mask_override && einj->cor_status &&
            !(einj->cor_status & ~cor_mask)) {
                ret = -EINVAL;
-               printk(KERN_WARNING "The correctable error(s) is masked "
-                               "by device\n");
+               printk(KERN_WARNING "The correctable error(s) is masked by device\n");
                spin_unlock_irqrestore(&inject_lock, flags);
                goto out_put;
        }
        if (!aer_mask_override && einj->uncor_status &&
            !(einj->uncor_status & ~uncor_mask)) {
                ret = -EINVAL;
-               printk(KERN_WARNING "The uncorrectable error(s) is masked "
-                               "by device\n");
+               printk(KERN_WARNING "The uncorrectable error(s) is masked by device\n");
                spin_unlock_irqrestore(&inject_lock, flags);
                goto out_put;
        }
@@ -464,8 +462,7 @@ static int aer_inject(struct aer_error_inj *einj)
                        goto out_put;
                }
                aer_irq(-1, edev);
-       }
-       else
+       } else
                ret = -EINVAL;
 out_put:
        kfree(err_alloc);