Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 904290c0 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman
Browse files

Staging: sep: rename some fields



Make them more Linuxlike - also favour _bus over _phys

Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 577092ac
Loading
Loading
Loading
Loading
+21 −21
Original line number Diff line number Diff line
@@ -30,29 +30,29 @@

struct sep_device {
	/* pointer to pci dev */
	struct pci_dev *sep_pci_dev_ptr;
	struct pci_dev *pdev;

	unsigned long io_memory_start_physical_address;
	unsigned long io_memory_end_physical_address;
	unsigned long io_bus;
	unsigned long io_end_bus;
	unsigned long io_memory_size;
	void *io_memory_start_virtual_address;
	void __iomem *io_addr;

	/* restricted access region */
	unsigned long rar_physical_address;
	void *rar_virtual_address;
	unsigned long rar_bus;
	void *rar_addr;

	/* shared memory region */
	unsigned long shared_physical_address;
	void *shared_virtual_address;
	unsigned long shared_bus;
	void *shared_addr;

	/* firmware regions */
	unsigned long cache_physical_address;
	unsigned long cache_bus;
	unsigned long cache_size;
	void *cache_virtual_address;
	void *cache_addr;

	unsigned long resident_physical_address;
	unsigned long resident_bus;
	unsigned long resident_size;
	void *resident_virtual_address;
	void *resident_addr;

	/* device interrupt (as retrieved from PCI) */
	int sep_irq;
@@ -60,11 +60,11 @@ struct sep_device {
	unsigned long rar_region_addr;

	/* start address of the access to the SEP registers from driver */
	void __iomem *reg_base_address;
	void __iomem *reg_addr;
	/* transaction counter that coordinates the transactions between SEP and HOST */
	unsigned long host_to_sep_send_counter;
	unsigned long send_ct;
	/* counter for the messages from sep */
	unsigned long sep_to_host_reply_counter;
	unsigned long reply_ct;
	/* counter for the number of bytes allocated in the pool for the current
	   transaction */
	unsigned long data_pool_bytes_allocated;
@@ -84,15 +84,15 @@ struct sep_device {
	unsigned long out_num_pages;

	/* global data for every flow */
	struct sep_flow_context_t flows_data_array[SEP_DRIVER_NUM_FLOWS];
	struct sep_flow_context_t flows[SEP_DRIVER_NUM_FLOWS];

	/* pointer to the workqueue that handles the flow done interrupts */
	struct workqueue_struct *flow_wq_ptr;
	struct workqueue_struct *flow_wq;

	/* address of the shared memory allocated during init for SEP driver */
	unsigned long shared_area_addr;
	unsigned long shared_area;
	/* the physical address of the shared area */
	unsigned long phys_shared_area_addr;
	unsigned long shared_area_bus;

	/* Message Shared Area start address - will be allocated during init */
	unsigned long message_shared_area_addr;
@@ -102,13 +102,13 @@ static struct sep_device *sep_dev;

static inline void sep_write_reg(struct sep_device *dev, int reg, u32 value)
{
	void __iomem *addr = dev->reg_base_address + reg;
	void __iomem *addr = dev->reg_addr + reg;
	writel(value, addr);
}

static inline u32 sep_read_reg(struct sep_device *dev, int reg)
{
	void __iomem *addr = dev->reg_base_address + reg;
	void __iomem *addr = dev->reg_addr + reg;
	return readl(addr);
}

+119 −119

File changed.

Preview size limit exceeded, changes collapsed.