Commit ead1f3e3 authored by Martyn Welch's avatar Martyn Welch Committed by Greg Kroah-Hartman

Staging: vme: Fix checkpatch errors on VME core.

Running checkpatch on the core VME code highlights many errors. Fix them.
Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 12b2d5c0
This diff is collapsed.
...@@ -98,28 +98,29 @@ struct vme_driver { ...@@ -98,28 +98,29 @@ struct vme_driver {
struct device_driver driver; struct device_driver driver;
}; };
void * vme_alloc_consistent(struct vme_resource *, size_t, dma_addr_t *); void *vme_alloc_consistent(struct vme_resource *, size_t, dma_addr_t *);
void vme_free_consistent(struct vme_resource *, size_t, void *, void vme_free_consistent(struct vme_resource *, size_t, void *,
dma_addr_t); dma_addr_t);
size_t vme_get_size(struct vme_resource *); size_t vme_get_size(struct vme_resource *);
struct vme_resource * vme_slave_request(struct device *, vme_address_t, vme_cycle_t); struct vme_resource *vme_slave_request(struct device *, vme_address_t,
int vme_slave_set (struct vme_resource *, int, unsigned long long, vme_cycle_t);
int vme_slave_set(struct vme_resource *, int, unsigned long long,
unsigned long long, dma_addr_t, vme_address_t, vme_cycle_t); unsigned long long, dma_addr_t, vme_address_t, vme_cycle_t);
int vme_slave_get (struct vme_resource *, int *, unsigned long long *, int vme_slave_get(struct vme_resource *, int *, unsigned long long *,
unsigned long long *, dma_addr_t *, vme_address_t *, vme_cycle_t *); unsigned long long *, dma_addr_t *, vme_address_t *, vme_cycle_t *);
void vme_slave_free(struct vme_resource *); void vme_slave_free(struct vme_resource *);
struct vme_resource * vme_master_request(struct device *, vme_address_t, vme_cycle_t, struct vme_resource *vme_master_request(struct device *, vme_address_t,
vme_width_t); vme_cycle_t, vme_width_t);
int vme_master_set (struct vme_resource *, int, unsigned long long, int vme_master_set(struct vme_resource *, int, unsigned long long,
unsigned long long, vme_address_t, vme_cycle_t, vme_width_t); unsigned long long, vme_address_t, vme_cycle_t, vme_width_t);
int vme_master_get (struct vme_resource *, int *, unsigned long long *, int vme_master_get(struct vme_resource *, int *, unsigned long long *,
unsigned long long *, vme_address_t *, vme_cycle_t *, vme_width_t *); unsigned long long *, vme_address_t *, vme_cycle_t *, vme_width_t *);
ssize_t vme_master_read(struct vme_resource *, void *, size_t, loff_t); ssize_t vme_master_read(struct vme_resource *, void *, size_t, loff_t);
ssize_t vme_master_write(struct vme_resource *, void *, size_t, loff_t); ssize_t vme_master_write(struct vme_resource *, void *, size_t, loff_t);
unsigned int vme_master_rmw (struct vme_resource *, unsigned int, unsigned int, unsigned int vme_master_rmw(struct vme_resource *, unsigned int, unsigned int,
unsigned int, loff_t); unsigned int, loff_t);
void vme_master_free(struct vme_resource *); void vme_master_free(struct vme_resource *);
...@@ -153,8 +154,8 @@ void vme_lm_free(struct vme_resource *); ...@@ -153,8 +154,8 @@ void vme_lm_free(struct vme_resource *);
int vme_slot_get(struct device *); int vme_slot_get(struct device *);
int vme_register_driver (struct vme_driver *); int vme_register_driver(struct vme_driver *);
void vme_unregister_driver (struct vme_driver *); void vme_unregister_driver(struct vme_driver *);
#endif /* _VME_H_ */ #endif /* _VME_H_ */
......
...@@ -101,7 +101,7 @@ struct vme_irq { ...@@ -101,7 +101,7 @@ struct vme_irq {
* Currently we assume that all chips are PCI-based * Currently we assume that all chips are PCI-based
*/ */
struct vme_bridge { struct vme_bridge {
char name[VMENAMSIZ]; char name[VMENAMSIZ];
int num; int num;
struct list_head master_resources; struct list_head master_resources;
struct list_head slave_resources; struct list_head slave_resources;
...@@ -112,7 +112,7 @@ struct vme_bridge { ...@@ -112,7 +112,7 @@ struct vme_bridge {
/* Bridge Info - XXX Move to private structure? */ /* Bridge Info - XXX Move to private structure? */
struct device *parent; /* Generic device struct (pdev->dev for PCI) */ struct device *parent; /* Generic device struct (pdev->dev for PCI) */
void * base; /* Base Address of device registers */ void *base; /* Base Address of device registers */
struct device dev[VME_SLOTS_MAX]; /* Device registered with struct device dev[VME_SLOTS_MAX]; /* Device registered with
* device model on VME bus * device model on VME bus
...@@ -178,8 +178,8 @@ struct vme_bridge { ...@@ -178,8 +178,8 @@ struct vme_bridge {
void vme_irq_handler(struct vme_bridge *, int, int); void vme_irq_handler(struct vme_bridge *, int, int);
int vme_register_bridge (struct vme_bridge *); int vme_register_bridge(struct vme_bridge *);
void vme_unregister_bridge (struct vme_bridge *); void vme_unregister_bridge(struct vme_bridge *);
#endif /* _VME_BRIDGE_H_ */ #endif /* _VME_BRIDGE_H_ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment