firewire: rename CSR access driver methods

Rather than "read a Control and Status Registers (CSR) Architecture
register" I prefer to say "read a Control and Status Register".

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

diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c
index 2e62516a4b15ca4b598c72e130a4d9afb9e17f7c..32a33da649910739925f900b5cad9c739a5bbaf7 100644 (file)
--- a/drivers/firewire/core-cdev.c
+++ b/drivers/firewire/core-cdev.c
@@ -1044,7 +1044,7 @@ static int ioctl_get_cycle_timer2(struct client *client, union ioctl_arg *arg)
 
        local_irq_disable();
 
-       cycle_time = card->driver->read_csr_reg(card, CSR_CYCLE_TIME);
+       cycle_time = card->driver->read_csr(card, CSR_CYCLE_TIME);
 
        switch (a->clk_id) {
        case CLOCK_REALTIME:      getnstimeofday(&ts);                   break;

diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
index b8f6db6a0494b56ed3c7eb8c014dfde9447bebb4..182da69eae446552d8d440396cea68ffbef6c669 100644 (file)
--- a/drivers/firewire/core-transaction.c
+++ b/drivers/firewire/core-transaction.c
@@ -1026,19 +1026,17 @@ static void handle_registers(struct fw_card *card, struct fw_request *request,
        case CSR_BUS_TIME:
        case CSR_BUSY_TIMEOUT:
                if (tcode == TCODE_READ_QUADLET_REQUEST)
-                       *data = cpu_to_be32(card->driver->
-                                           read_csr_reg(card, reg));
+                       *data = cpu_to_be32(card->driver->read_csr(card, reg));
                else if (tcode == TCODE_WRITE_QUADLET_REQUEST)
-                       card->driver->write_csr_reg(card, reg,
-                                                   be32_to_cpu(*data));
+                       card->driver->write_csr(card, reg, be32_to_cpu(*data));
                else
                        rcode = RCODE_TYPE_ERROR;
                break;
 
        case CSR_RESET_START:
                if (tcode == TCODE_WRITE_QUADLET_REQUEST)
-                       card->driver->write_csr_reg(card, CSR_STATE_CLEAR,
-                                                   CSR_STATE_BIT_ABDICATE);
+                       card->driver->write_csr(card, CSR_STATE_CLEAR,
+                                               CSR_STATE_BIT_ABDICATE);
                else
                        rcode = RCODE_TYPE_ERROR;
                break;

diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
index 8280c625170b991c212acd68246d8c8f2c68cc02..3000dd74acfd26ae8438e653b0fe5e387a8cad28 100644 (file)
--- a/drivers/firewire/core.h
+++ b/drivers/firewire/core.h
@@ -78,8 +78,8 @@ struct fw_card_driver {
        int (*enable_phys_dma)(struct fw_card *card,
                               int node_id, int generation);
 
-       u32 (*read_csr_reg)(struct fw_card *card, int csr_offset);
-       void (*write_csr_reg)(struct fw_card *card, int csr_offset, u32 value);
+       u32 (*read_csr)(struct fw_card *card, int csr_offset);
+       void (*write_csr)(struct fw_card *card, int csr_offset, u32 value);
 
        struct fw_iso_context *
        (*allocate_iso_context)(struct fw_card *card,

diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index a55cf0911b7294b72c6b71ea00b585f2bd670163..a4bbf3dadf58c55d7d084382dc6de578e5de106b 100644 (file)
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2026,7 +2026,7 @@ static int ohci_enable_phys_dma(struct fw_card *card,
 #endif /* CONFIG_FIREWIRE_OHCI_REMOTE_DMA */
 }
 
-static u32 ohci_read_csr_reg(struct fw_card *card, int csr_offset)
+static u32 ohci_read_csr(struct fw_card *card, int csr_offset)
 {
        struct fw_ohci *ohci = fw_ohci(card);
        unsigned long flags;
@@ -2077,7 +2077,7 @@ static u32 ohci_read_csr_reg(struct fw_card *card, int csr_offset)
        }
 }
 
-static void ohci_write_csr_reg(struct fw_card *card, int csr_offset, u32 value)
+static void ohci_write_csr(struct fw_card *card, int csr_offset, u32 value)
 {
        struct fw_ohci *ohci = fw_ohci(card);
        unsigned long flags;
@@ -2576,8 +2576,8 @@ static const struct fw_card_driver ohci_driver = {
        .send_response          = ohci_send_response,
        .cancel_packet          = ohci_cancel_packet,
        .enable_phys_dma        = ohci_enable_phys_dma,
-       .read_csr_reg           = ohci_read_csr_reg,
-       .write_csr_reg          = ohci_write_csr_reg,
+       .read_csr               = ohci_read_csr,
+       .write_csr              = ohci_write_csr,
 
        .allocate_iso_context   = ohci_allocate_iso_context,
        .free_iso_context       = ohci_free_iso_context,