Commit 42d4eff7 authored by Martyn Welch's avatar Martyn Welch Committed by Greg Kroah-Hartman
Browse files

Staging: vme: Allow drivers to co-exist 



Unable to build both drivers at the same time due to classing variables that should be declared static but aren't.

Signed-off-by: default avatarMartyn Welch <martyn.welch@gefanuc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3cb1b8a7

drivers/staging/vme/bridges/vme_ca91cx42.c

+17 −15
Original line number Diff line number Diff line
@@ -41,18 +41,20 @@ static void __exit ca91cx42_exit(void); 
/* Module parameters */

static int geoid;



struct vme_bridge *ca91cx42_bridge;

wait_queue_head_t dma_queue;

wait_queue_head_t iack_queue;

wait_queue_head_t lm_queue;

wait_queue_head_t mbox_queue;



void (*lm_callback[4])(int);    /* Called in interrupt handler, be careful! */

void *crcsr_kernel;

dma_addr_t crcsr_bus;



struct mutex vme_rmw;   /* Only one RMW cycle at a time */

struct mutex vme_int;   /*

static struct vme_bridge *ca91cx42_bridge;

static wait_queue_head_t dma_queue;

static wait_queue_head_t iack_queue;

#if 0

static wait_queue_head_t lm_queue;

#endif

static wait_queue_head_t mbox_queue;



static void (*lm_callback[4])(int);	/* Called in interrupt handler */

static void *crcsr_kernel;

static dma_addr_t crcsr_bus;



static struct mutex vme_rmw;	/* Only one RMW cycle at a time */

static struct mutex vme_int;	/*

				 * Only one VME interrupt can be

				 * generated at a time, provide locking

				 */

drivers/staging/vme/bridges/vme_tsi148.c

+10 −10
Original line number Diff line number Diff line
@@ -62,19 +62,19 @@ int tsi148_generate_irq(int, int); 
int tsi148_slot_get(void);



/* Modue parameter */

int err_chk = 0;

static int err_chk;

static int geoid;



/* XXX These should all be in a per device structure */

struct vme_bridge *tsi148_bridge;

wait_queue_head_t dma_queue[2];

wait_queue_head_t iack_queue;

void (*lm_callback[4])(int);	/* Called in interrupt handler, be careful! */

void *crcsr_kernel;

dma_addr_t crcsr_bus;

struct vme_master_resource *flush_image;

struct mutex vme_rmw;	/* Only one RMW cycle at a time */

struct mutex vme_int;	/*

static struct vme_bridge *tsi148_bridge;

static wait_queue_head_t dma_queue[2];

static wait_queue_head_t iack_queue;

static void (*lm_callback[4])(int);	/* Called in interrupt handler */

static void *crcsr_kernel;

static dma_addr_t crcsr_bus;

static struct vme_master_resource *flush_image;

static struct mutex vme_rmw;	/* Only one RMW cycle at a time */

static struct mutex vme_int;	/*

				 * Only one VME interrupt can be

				 * generated at a time, provide locking

				 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE