PCI: aerdrv: remove compare_device_id

Inline too-simple subroutine only used here.

Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

1 files changed, 2 insertions, 16 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 5b02f62cdc47..f8ffa47503b7 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -99,19 +99,6 @@ int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 }
 EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);
 
-static inline int compare_device_id(struct pci_dev *dev,
-                        struct aer_err_info *e_info)
-{
-        if (e_info->id == ((dev->bus->number << 8) | dev->devfn)) {
-                /*
-                 * Device ID match
-                 */
-                return 1;
-        }
-
-        return 0;
-}
-
 static int add_error_device(struct aer_err_info *e_info, struct pci_dev *dev)
 {
         if (e_info->error_dev_num < AER_MAX_MULTI_ERR_DEVICES) {
@@ -136,15 +123,14 @@ static bool is_error_source(struct pci_dev *dev, struct aer_err_info *e_info)
         int pos;
         u32 status, mask;
         u16 reg16;
-        int result;
 
         /*
          * When bus id is equal to 0, it might be a bad id
          * reported by root port.
          */
         if (!nosourceid && (PCI_BUS(e_info->id) != 0)) {
-                result = compare_device_id(dev, e_info);
-                if (result)
+                /* Device ID match? */
+                if (e_info->id == ((dev->bus->number << 8) | dev->devfn))
                         return true;
 
                 /* Continue id comparing if there is no multiple error */