staging: olpc_dcon: move more variables into dcon_priv

[firefly-linux-kernel-4.4.55.git] / drivers / staging / olpc_dcon / olpc_dcon_xo_1.c

diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
index be52b6c9c50e3c017a3da7747498c5041521d912..b154be7a2fe64dc513df57de2dc7379086e88d97 100644 (file)
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
@@ -16,7 +16,7 @@
 
 #include "olpc_dcon.h"
 
-static int dcon_init_xo_1(void)
+static int dcon_init_xo_1(struct dcon_priv *dcon)
 {
        unsigned char lob;
 
@@ -54,10 +54,10 @@ static int dcon_init_xo_1(void)
         * then a value is set.  So, future readings of the pin can use
         * READ_BACK, but the first one cannot.  Awesome, huh?
         */
-       dcon_source = cs5535_gpio_isset(OLPC_GPIO_DCON_LOAD, GPIO_OUTPUT_VAL)
+       dcon->curr_src = cs5535_gpio_isset(OLPC_GPIO_DCON_LOAD, GPIO_OUTPUT_VAL)
                ? DCON_SOURCE_CPU
                : DCON_SOURCE_DCON;
-       dcon_pending = dcon_source;
+       dcon->pending_src = dcon->curr_src;
 
        /* Set the directions for the GPIO pins */
        gpio_direction_input(OLPC_GPIO_DCON_STAT0);
@@ -65,7 +65,7 @@ static int dcon_init_xo_1(void)
        gpio_direction_input(OLPC_GPIO_DCON_IRQ);
        gpio_direction_input(OLPC_GPIO_DCON_BLANK);
        gpio_direction_output(OLPC_GPIO_DCON_LOAD,
-                       dcon_source == DCON_SOURCE_CPU);
+                       dcon->curr_src == DCON_SOURCE_CPU);
 
        /* Set up the interrupt mappings */
 
@@ -81,7 +81,7 @@ static int dcon_init_xo_1(void)
        outb(lob, 0x4d0);
 
        /* Register the interupt handler */
-       if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", &dcon_driver)) {
+       if (request_irq(DCON_IRQ, &dcon_interrupt, 0, "DCON", dcon)) {
                printk(KERN_ERR "olpc-dcon: failed to request DCON's irq\n");
                goto err_req_irq;
        }