diff options
author | Gavin Shan <gwshan@linux.vnet.ibm.com> | 2014-09-29 22:38:50 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-09-30 03:15:05 -0400 |
commit | 3e938052fb7655c91ff031dd93f064b4087a1387 (patch) | |
tree | df3322a817a3886113ab61a7fc10871071392eec /arch/powerpc/kernel/eeh.c | |
parent | a75c380c7129c432f8ac9d42ebc170e5f7d9d31e (diff) |
powerpc/eeh: Drop unused argument in eeh_check_failure()
eeh_check_failure() is used to check frozen state of the PE which
owns the indicated I/O address. The argument "val" of the function
isn't used. The patch drops it and return the frozen state of the
PE as expected.
Cc: Vishal Mansur <vmansur@linux.vnet.ibm.com>
Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/kernel/eeh.c')
-rw-r--r-- | arch/powerpc/kernel/eeh.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 0f1b63714718..db35c2722201 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c | |||
@@ -542,17 +542,16 @@ EXPORT_SYMBOL_GPL(eeh_dev_check_failure); | |||
542 | 542 | ||
543 | /** | 543 | /** |
544 | * eeh_check_failure - Check if all 1's data is due to EEH slot freeze | 544 | * eeh_check_failure - Check if all 1's data is due to EEH slot freeze |
545 | * @token: I/O token, should be address in the form 0xA.... | 545 | * @token: I/O address |
546 | * @val: value, should be all 1's (XXX why do we need this arg??) | ||
547 | * | 546 | * |
548 | * Check for an EEH failure at the given token address. Call this | 547 | * Check for an EEH failure at the given I/O address. Call this |
549 | * routine if the result of a read was all 0xff's and you want to | 548 | * routine if the result of a read was all 0xff's and you want to |
550 | * find out if this is due to an EEH slot freeze event. This routine | 549 | * find out if this is due to an EEH slot freeze event. This routine |
551 | * will query firmware for the EEH status. | 550 | * will query firmware for the EEH status. |
552 | * | 551 | * |
553 | * Note this routine is safe to call in an interrupt context. | 552 | * Note this routine is safe to call in an interrupt context. |
554 | */ | 553 | */ |
555 | unsigned long eeh_check_failure(const volatile void __iomem *token, unsigned long val) | 554 | int eeh_check_failure(const volatile void __iomem *token) |
556 | { | 555 | { |
557 | unsigned long addr; | 556 | unsigned long addr; |
558 | struct eeh_dev *edev; | 557 | struct eeh_dev *edev; |
@@ -562,13 +561,11 @@ unsigned long eeh_check_failure(const volatile void __iomem *token, unsigned lon | |||
562 | edev = eeh_addr_cache_get_dev(addr); | 561 | edev = eeh_addr_cache_get_dev(addr); |
563 | if (!edev) { | 562 | if (!edev) { |
564 | eeh_stats.no_device++; | 563 | eeh_stats.no_device++; |
565 | return val; | 564 | return 0; |
566 | } | 565 | } |
567 | 566 | ||
568 | eeh_dev_check_failure(edev); | 567 | return eeh_dev_check_failure(edev); |
569 | return val; | ||
570 | } | 568 | } |
571 | |||
572 | EXPORT_SYMBOL(eeh_check_failure); | 569 | EXPORT_SYMBOL(eeh_check_failure); |
573 | 570 | ||
574 | 571 | ||