diff options
author | Alan Mikhak <alan.mikhak@sifive.com> | 2019-05-23 14:18:00 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-24 08:21:08 +0100 |
commit | ff36ace6c107a3abe90f08e1712650a207eb7327 (patch) | |
tree | 22130b64ece914d4d31e815d6a30e6e3ee8f1f78 /tools | |
parent | 4039b5dd0f6712c9c4e7ea4e4199c75f52a9ccbb (diff) | |
download | linux-stable-ff36ace6c107a3abe90f08e1712650a207eb7327.tar.gz linux-stable-ff36ace6c107a3abe90f08e1712650a207eb7327.tar.bz2 linux-stable-ff36ace6c107a3abe90f08e1712650a207eb7327.zip |
tools: PCI: Fix broken pcitest compilation
[ Upstream commit 8a5e0af240e07dd3d4897eb8ff52aab757da7fab ]
pcitest is currently broken due to the following compiler error
and related warning. Fix by changing the run_test() function
signature to return an integer result.
pcitest.c: In function run_test:
pcitest.c:143:9: warning: return with a value, in function
returning void
return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */
pcitest.c: In function main:
pcitest.c:232:9: error: void value not ignored as it ought to be
return run_test(test);
Fixes: fef31ecaaf2c ("tools: PCI: Fix compilation warnings")
Signed-off-by: Alan Mikhak <alan.mikhak@sifive.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Paul Walmsley <paul.walmsley@sifive.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/pci/pcitest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c index ec4d51f3308b..4c5be77c211f 100644 --- a/tools/pci/pcitest.c +++ b/tools/pci/pcitest.c @@ -47,15 +47,15 @@ struct pci_test { unsigned long size; }; -static void run_test(struct pci_test *test) +static int run_test(struct pci_test *test) { - long ret; + int ret = -EINVAL; int fd; fd = open(test->device, O_RDWR); if (fd < 0) { perror("can't open PCI Endpoint Test device"); - return; + return -ENODEV; } if (test->barnum >= 0 && test->barnum <= 5) { |