Skip to content

Commit

Permalink
tools: PCI: Fix broken pcitest compilation
Browse files Browse the repository at this point in the history
[ 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 <[email protected]>
Signed-off-by: Lorenzo Pieralisi <[email protected]>
Reviewed-by: Paul Walmsley <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
alanmikhak-at-sifive authored and gregkh committed Nov 24, 2019
1 parent 1dee3a3 commit d09d148
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions tools/pci/pcitest.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit d09d148

Please sign in to comment.