Commit 0fcff4e3 authored by Stefan Richter's avatar Stefan Richter
Browse files

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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent b384cf18

drivers/firewire/core-cdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/firewire/core-transaction.c

+4 −6
Original line number Diff line number Diff line
@@ -1026,18 +1026,16 @@ 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,

			card->driver->write_csr(card, CSR_STATE_CLEAR,

						CSR_STATE_BIT_ABDICATE);

		else

			rcode = RCODE_TYPE_ERROR;

drivers/firewire/core.h

+2 −2
Original line number Diff line number Diff line
@@ -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,

drivers/firewire/ohci.c

+4 −4
Original line number Diff line number Diff line
@@ -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,