summaryrefslogtreecommitdiffstats
path: root/drivers/firewire/core-transaction.c
diff options
context:
space:
mode:
authorClemens Ladisch <clemens@ladisch.de>2010-06-10 08:24:35 +0200
committerClemens Ladisch <clemens@ladisch.de>2010-06-10 08:24:35 +0200
commit60d32970c5a32e8c4f340a9e41993759ad658ef2 (patch)
treea7f60c934ae250f0291622cb02540638ef7cbf6d /drivers/firewire/core-transaction.c
parentfirewire: core: add CSR STATE_CLEAR/STATE_SET support (diff)
downloadlinux-60d32970c5a32e8c4f340a9e41993759ad658ef2.tar.xz
linux-60d32970c5a32e8c4f340a9e41993759ad658ef2.zip
firewire: add read_csr_reg driver callback
To prepare for the following additions of more OHCI-implemented CSR registers, replace the get_cycle_time driver callback with a generic CSR register callback. Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Diffstat (limited to 'drivers/firewire/core-transaction.c')
-rw-r--r--drivers/firewire/core-transaction.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index 6971400b6354..a4d8109edec2 100644
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -1025,7 +1025,8 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
case CSR_CYCLE_TIME:
if (TCODE_IS_READ_REQUEST(tcode) && length == 4)
- *data = cpu_to_be32(card->driver->get_cycle_time(card));
+ *data = cpu_to_be32(card->driver->
+ read_csr_reg(card, CSR_CYCLE_TIME));
else
rcode = RCODE_TYPE_ERROR;
break;