diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-13 14:45:50 +1000 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2014-07-13 14:45:50 +1000 |
commit | 21175cd2ee364d7024d349cf998728fa3974c2a0 (patch) | |
tree | 735664f398fe0fc9a8c194e02072a4522cc3094b /hw/p7ioc-phb.c | |
parent | 3c08f8ebe43825a7d24f1a3a81f6cda26b375da7 (diff) | |
download | skiboot-21175cd2ee364d7024d349cf998728fa3974c2a0.zip skiboot-21175cd2ee364d7024d349cf998728fa3974c2a0.tar.gz skiboot-21175cd2ee364d7024d349cf998728fa3974c2a0.tar.bz2 |
p7ioc-phb: Remove recursive locking
I can't quite figure what this code was trying to do, but
I don't see how it would help, phb3_read_phb_status() should
already have the right amount of locking in the caller.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'hw/p7ioc-phb.c')
-rw-r--r-- | hw/p7ioc-phb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/hw/p7ioc-phb.c b/hw/p7ioc-phb.c index 8dc7616..f18a511 100644 --- a/hw/p7ioc-phb.c +++ b/hw/p7ioc-phb.c @@ -854,7 +854,6 @@ static int64_t p7ioc_poll(struct phb *phb) static void p7ioc_eeh_read_phb_status(struct p7ioc_phb *p, struct OpalIoP7IOCPhbErrorData *stat) { - bool locked; uint16_t tmp16; unsigned int i; @@ -879,7 +878,6 @@ static void p7ioc_eeh_read_phb_status(struct p7ioc_phb *p, */ /* Use ASB to access PCICFG if the PHB has been fenced */ - locked = lock_recursive(&p->lock); p->flags |= P7IOC_PHB_CFG_USE_ASB; /* Grab RC bridge control, make it 32-bit */ @@ -935,10 +933,6 @@ static void p7ioc_eeh_read_phb_status(struct p7ioc_phb *p, /* Restore to AIB */ p->flags &= ~P7IOC_PHB_CFG_USE_ASB; - if (locked) { - unlock(&p->lock); - pci_put_phb(&p->phb); - } /* * No idea what that that is supposed to be, opal.h says |