[tip:perf/core] perf/x86/intel/uncore: Delete an unnecessary check before pci_dev_put() call

tip-bot for Markus Elfring
2015-02-18T17:13:35Z

Commit-ID: 8e57c586c6a8333c266a6cf76d50e110f2954558
Gitweb: http://git.kernel.org/tip/8e57c586c6a8333c266a6cf76d50e110f2954558
Author: Markus Elfring <elfring@users.sourceforge.net>
AuthorDate: Tue, 3 Feb 2015 12:40:54 +0100
Committer: Ingo Molnar <mingo@kernel.org>
CommitDate: Wed, 18 Feb 2015 17:01:42 +0100

perf/x86/intel/uncore: Delete an unnecessary check before pci_dev_put() call

The pci_dev_put() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/54D0B59C.2060106@users.sourceforge.net
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
index 21af6149e..12d9548 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore_snbep.c
@@ -1132,8 +1132,7 @@ static int snbep_pci2phy_map_init(int devid)
}
}

- if (ubox_dev)
- pci_dev_put(ubox_dev);
+ pci_dev_put(ubox_dev);

return err ? pcibios_err_to_errno(err) : 0;
}