]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
tools: PCI: Fix broken pcitest compilation
authorAlan Mikhak <alan.mikhak@sifive.com>
Thu, 23 May 2019 21:18:00 +0000 (14:18 -0700)
committerKhalid Elmously <khalid.elmously@canonical.com>
Thu, 28 Nov 2019 04:59:27 +0000 (23:59 -0500)
BugLink: https://bugs.launchpad.net/bugs/1854216
[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
tools/pci/pcitest.c

index 8ca1c62bc06db6d947c66642e9504df46f029813..7002df55826f42a097d0e417efc67cf17c3dcb38 100644 (file)
@@ -42,15 +42,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) {