firewire: normalize STATE_CLEAR/SET CSR access interface

Push the maintenance of STATE_CLEAR/SET.abdicate down into the card
driver.  This way, the read/write_csr_reg driver method works uniformly
across all CSR offsets.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>

1 files changed, 1 insertions, 2 deletions

diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index 5acb5fc19180..5553018d45d6 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -119,8 +119,7 @@ struct fw_card {
         int bm_retries;
         int bm_generation;
         __be32 bm_transaction_data[2];
-        bool bm_abdicate; /* value of csr_abdicate before last bus reset */
-        bool csr_abdicate; /* visible in CSR STATE_CLEAR/SET registers */
+        bool bm_abdicate;
 
         bool priority_budget_implemented;       /* controller feature */
         bool broadcast_channel_auto_allocated;  /* controller feature */