Skip to content

L
linux
Commit efbb979d authored by Emilio G. Cota's avatar Emilio G. Cota Committed by Greg Kroah-Hartman
Browse files
Options

staging: vme: ca91cx42: declare static functions as such 

Signed-off-by: default avatarEmilio G. Cota <cota@braap.org>
[martyn.welch@ge.com: modified to remove checkpatch warnings]
Signed-off-by: default avatarMartyn Welch <martyn.welch@ge.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ade6c4d
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
drivers/staging/vme/bridges/vme_ca91cx42.c
View file @ efbb979d
...@@ -259,8 +259,8 @@ static void ca91cx42_irq_exit(struct ca91cx42_driver *bridge, ...@@ -259,8 +259,8 @@ static void ca91cx42_irq_exit(struct ca91cx42_driver *bridge,
/* /*
* Set up an VME interrupt * Set up an VME interrupt
*/ */
void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, int state, static void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level,
int sync) int state, int sync)
{ {
struct pci_dev *pdev; struct pci_dev *pdev;
...@@ -287,7 +287,7 @@ void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, int state, ...@@ -287,7 +287,7 @@ void ca91cx42_irq_set(struct vme_bridge *ca91cx42_bridge, int level, int state,
} }
} }
int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level, static int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
int statid) int statid)
{ {
u32 tmp; u32 tmp;
...@@ -323,7 +323,7 @@ int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level, ...@@ -323,7 +323,7 @@ int ca91cx42_irq_generate(struct vme_bridge *ca91cx42_bridge, int level,
return 0; return 0;
} }
int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled, static int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
unsigned long long vme_base, unsigned long long size, unsigned long long vme_base, unsigned long long size,
dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle) dma_addr_t pci_base, vme_address_t aspace, vme_cycle_t cycle)
{ {
...@@ -429,7 +429,7 @@ int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled, ...@@ -429,7 +429,7 @@ int ca91cx42_slave_set(struct vme_slave_resource *image, int enabled,
return 0; return 0;
} }
int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled, static int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled,
unsigned long long *vme_base, unsigned long long *size, unsigned long long *vme_base, unsigned long long *size,
dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle) dma_addr_t *pci_base, vme_address_t *aspace, vme_cycle_t *cycle)
{ {
...@@ -584,7 +584,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image) ...@@ -584,7 +584,7 @@ static void ca91cx42_free_resource(struct vme_master_resource *image)
} }
int ca91cx42_master_set(struct vme_master_resource *image, int enabled, static int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
unsigned long long vme_base, unsigned long long size, unsigned long long vme_base, unsigned long long size,
vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth) vme_address_t aspace, vme_cycle_t cycle, vme_width_t dwidth)
{ {
...@@ -741,8 +741,8 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled, ...@@ -741,8 +741,8 @@ int ca91cx42_master_set(struct vme_master_resource *image, int enabled,
return retval; return retval;
} }
int __ca91cx42_master_get(struct vme_master_resource *image, int *enabled, static int __ca91cx42_master_get(struct vme_master_resource *image,
unsigned long long *vme_base, unsigned long long *size, int *enabled, unsigned long long *vme_base, unsigned long long *size,
vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth) vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
{ {
unsigned int i, ctl; unsigned int i, ctl;
...@@ -828,7 +828,7 @@ int __ca91cx42_master_get(struct vme_master_resource *image, int *enabled, ...@@ -828,7 +828,7 @@ int __ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
return 0; return 0;
} }
int ca91cx42_master_get(struct vme_master_resource *image, int *enabled, static int ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
unsigned long long *vme_base, unsigned long long *size, unsigned long long *vme_base, unsigned long long *size,
vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth) vme_address_t *aspace, vme_cycle_t *cycle, vme_width_t *dwidth)
{ {
...@@ -844,8 +844,8 @@ int ca91cx42_master_get(struct vme_master_resource *image, int *enabled, ...@@ -844,8 +844,8 @@ int ca91cx42_master_get(struct vme_master_resource *image, int *enabled,
return retval; return retval;
} }
ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf, static ssize_t ca91cx42_master_read(struct vme_master_resource *image,
size_t count, loff_t offset) void *buf, size_t count, loff_t offset)
{ {
ssize_t retval; ssize_t retval;
void *addr = image->kern_base + offset; void *addr = image->kern_base + offset;
...@@ -904,8 +904,8 @@ ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf, ...@@ -904,8 +904,8 @@ ssize_t ca91cx42_master_read(struct vme_master_resource *image, void *buf,
return retval; return retval;
} }
ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf, static ssize_t ca91cx42_master_write(struct vme_master_resource *image,
size_t count, loff_t offset) void *buf, size_t count, loff_t offset)
{ {
ssize_t retval; ssize_t retval;
void *addr = image->kern_base + offset; void *addr = image->kern_base + offset;
...@@ -959,7 +959,7 @@ ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf, ...@@ -959,7 +959,7 @@ ssize_t ca91cx42_master_write(struct vme_master_resource *image, void *buf,
return retval; return retval;
} }
unsigned int ca91cx42_master_rmw(struct vme_master_resource *image, static unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
unsigned int mask, unsigned int compare, unsigned int swap, unsigned int mask, unsigned int compare, unsigned int swap,
loff_t offset) loff_t offset)
{ {
...@@ -1015,8 +1015,8 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image, ...@@ -1015,8 +1015,8 @@ unsigned int ca91cx42_master_rmw(struct vme_master_resource *image,
return result; return result;
} }
int ca91cx42_dma_list_add(struct vme_dma_list *list, struct vme_dma_attr *src, static int ca91cx42_dma_list_add(struct vme_dma_list *list,
struct vme_dma_attr *dest, size_t count) struct vme_dma_attr *src, struct vme_dma_attr *dest, size_t count)
{ {
struct ca91cx42_dma_entry *entry, *prev; struct ca91cx42_dma_entry *entry, *prev;
struct vme_dma_pci *pci_attr; struct vme_dma_pci *pci_attr;
...@@ -1176,7 +1176,7 @@ static int ca91cx42_dma_busy(struct vme_bridge *ca91cx42_bridge) ...@@ -1176,7 +1176,7 @@ static int ca91cx42_dma_busy(struct vme_bridge *ca91cx42_bridge)
return 1; return 1;
} }
int ca91cx42_dma_list_exec(struct vme_dma_list *list) static int ca91cx42_dma_list_exec(struct vme_dma_list *list)
{ {
struct vme_dma_resource *ctrlr; struct vme_dma_resource *ctrlr;
struct ca91cx42_dma_entry *entry; struct ca91cx42_dma_entry *entry;
...@@ -1258,7 +1258,7 @@ int ca91cx42_dma_list_exec(struct vme_dma_list *list) ...@@ -1258,7 +1258,7 @@ int ca91cx42_dma_list_exec(struct vme_dma_list *list)
} }
int ca91cx42_dma_list_empty(struct vme_dma_list *list) static int ca91cx42_dma_list_empty(struct vme_dma_list *list)
{ {
struct list_head *pos, *temp; struct list_head *pos, *temp;
struct ca91cx42_dma_entry *entry; struct ca91cx42_dma_entry *entry;
...@@ -1280,8 +1280,8 @@ int ca91cx42_dma_list_empty(struct vme_dma_list *list) ...@@ -1280,8 +1280,8 @@ int ca91cx42_dma_list_empty(struct vme_dma_list *list)
* This does not enable the LM monitor - that should be done when the first * This does not enable the LM monitor - that should be done when the first
* callback is attached and disabled when the last callback is removed. * callback is attached and disabled when the last callback is removed.
*/ */
int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, static int ca91cx42_lm_set(struct vme_lm_resource *lm,
vme_address_t aspace, vme_cycle_t cycle) unsigned long long lm_base, vme_address_t aspace, vme_cycle_t cycle)
{ {
u32 temp_base, lm_ctl = 0; u32 temp_base, lm_ctl = 0;
int i; int i;
...@@ -1348,8 +1348,8 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base, ...@@ -1348,8 +1348,8 @@ int ca91cx42_lm_set(struct vme_lm_resource *lm, unsigned long long lm_base,
/* Get configuration of the callback monitor and return whether it is enabled /* Get configuration of the callback monitor and return whether it is enabled
* or disabled. * or disabled.
*/ */
int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base, static int ca91cx42_lm_get(struct vme_lm_resource *lm,
vme_address_t *aspace, vme_cycle_t *cycle) unsigned long long *lm_base, vme_address_t *aspace, vme_cycle_t *cycle)
{ {
u32 lm_ctl, enabled = 0; u32 lm_ctl, enabled = 0;
struct ca91cx42_driver *bridge; struct ca91cx42_driver *bridge;
...@@ -1391,7 +1391,7 @@ int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base, ...@@ -1391,7 +1391,7 @@ int ca91cx42_lm_get(struct vme_lm_resource *lm, unsigned long long *lm_base,
* *
* Callback will be passed the monitor triggered. * Callback will be passed the monitor triggered.
*/ */
int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor, static int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
void (*callback)(int)) void (*callback)(int))
{ {
u32 lm_ctl, tmp; u32 lm_ctl, tmp;
...@@ -1440,7 +1440,7 @@ int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor, ...@@ -1440,7 +1440,7 @@ int ca91cx42_lm_attach(struct vme_lm_resource *lm, int monitor,
/* /*
* Detach a callback function forn a specific location monitor. * Detach a callback function forn a specific location monitor.
*/ */
int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor) static int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor)
{ {
u32 tmp; u32 tmp;
struct ca91cx42_driver *bridge; struct ca91cx42_driver *bridge;
...@@ -1473,7 +1473,7 @@ int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor) ...@@ -1473,7 +1473,7 @@ int ca91cx42_lm_detach(struct vme_lm_resource *lm, int monitor)
return 0; return 0;
} }
int ca91cx42_slot_get(struct vme_bridge *ca91cx42_bridge) static int ca91cx42_slot_get(struct vme_bridge *ca91cx42_bridge)
{ {
u32 slot = 0; u32 slot = 0;
struct ca91cx42_driver *bridge; struct ca91cx42_driver *bridge;
...@@ -1832,7 +1832,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id) ...@@ -1832,7 +1832,7 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
} }
void ca91cx42_remove(struct pci_dev *pdev) static void ca91cx42_remove(struct pci_dev *pdev)
{ {
struct list_head *pos = NULL; struct list_head *pos = NULL;
struct vme_master_resource *master_image; struct vme_master_resource *master_image;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7