diff options
| author |   Andres Salomon <dilinger@queued.net> | 2011-01-12 17:00:11 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 08:03:13 -0800 |
| commit | 7637c9259f7b6dd841471ccf1120d484b7364f99 (patch) | |
| tree | 1284edad0917aafa6b9fab7e2f98f460b671d2dc /drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | |
| parent | drivers/gpio/cs5535-gpio.c: add some additional cs5535-specific GPIO functionality (diff) | |
| download | linux-dev-7637c9259f7b6dd841471ccf1120d484b7364f99.tar.xz linux-dev-7637c9259f7b6dd841471ccf1120d484b7364f99.zip | |
drivers/staging/olpc_dcon: convert to new cs5535 gpio API
Drop the old geode_gpio crud, as well as the raw outl() calls; instead,
use the Linux GPIO API where possible, and the cs5535_gpio API in other
places.
Note that we don't actually clean up the driver properly yet (once loaded,
it always remains loaded). That'll come later..
This patch is necessary for building the driver.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c')
| -rw-r--r-- | drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c index cca6a235ef96..4f56098bb366 100644 --- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c +++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c @@ -195,9 +195,9 @@ static void dcon_set_dconload_xo_1_5(int val) } } -static int dcon_read_status_xo_1_5(void) +static u8 dcon_read_status_xo_1_5(void) { - int status; + u8 status; if (!dcon_was_irq()) return -1; |