From c66e12ea5e9c893a3a46bb0a9a488dd1e2b98aeb Mon Sep 17 00:00:00 2001
From: blogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 24 Jun 2008 19:24:22 +0000
Subject: cleanup ifxmips headers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11573 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
.../files/include/asm-mips/ifxmips/ifxmips_wdt.h | 1 -
.../files/include/asm-mips/mach-ifxmips/gpio.h | 50 ++++++++++++++--------
.../files/include/asm-mips/mach-ifxmips/irq.h | 3 --
.../files/include/asm-mips/mach-ifxmips/war.h | 18 ++++++--
4 files changed, 48 insertions(+), 24 deletions(-)
(limited to 'target/linux')
diff --git a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h
index 34833e8ea..5071d778a 100644
--- a/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h
+++ b/target/linux/ifxmips/files/include/asm-mips/ifxmips/ifxmips_wdt.h
@@ -15,7 +15,6 @@
*
* Copyright (C) 2005 infineon
* Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *
*/
#ifndef IFXMIPS_WDT_H
diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
index 0d207b093..2ea25f289 100644
--- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
+++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/gpio.h
@@ -1,6 +1,4 @@
/*
- * include/asm-mips/mach-ifxmips/gpio.h
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -16,63 +14,81 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *
*/
-
#ifndef _IFXMIPS_GPIO_H_
#define _IFXMIPS_GPIO_H_
#include <asm/ifxmips/ifxmips.h>
#include <asm/ifxmips/ifxmips_gpio.h>
-static inline int gpio_direction_input(unsigned gpio) {
+static inline int
+gpio_direction_input(unsigned gpio)
+{
ifxmips_port_set_dir_in(0, gpio);
return 0;
}
-static inline int gpio_direction_output(unsigned gpio, int value) {
+static inline int
+gpio_direction_output(unsigned gpio, int value)
+{
ifxmips_port_set_dir_out(0, gpio);
return 0;
}
-static inline int gpio_get_value(unsigned gpio) {
+static inline int
+gpio_get_value(unsigned gpio)
+{
ifxmips_port_get_input(0, gpio);
return 0;
}
-static inline void gpio_set_value(unsigned gpio, int value) {
+static inline void
+gpio_set_value(unsigned gpio, int value)
+{
ifxmips_port_set_output(0, gpio);
}
-static inline int gpio_request(unsigned gpio, const char *label) {
+static inline int
+gpio_request(unsigned gpio, const char *label)
+{
return 0;
}
-static inline void gpio_free(unsigned gpio) {
+static inline void
+gpio_free(unsigned gpio)
+{
}
-static inline int gpio_to_irq(unsigned gpio) {
+static inline int
+gpio_to_irq(unsigned gpio)
+{
return 0;
}
-static inline int irq_to_gpio(unsigned irq) {
+static inline int
+irq_to_gpio(unsigned irq)
+{
return 0;
}
-static inline int gpio_cansleep(unsigned gpio) {
+static inline int
+gpio_cansleep(unsigned gpio)
+{
return 0;
}
-static inline int gpio_get_value_cansleep(unsigned gpio) {
+static inline int
+gpio_get_value_cansleep(unsigned gpio)
+{
might_sleep();
return gpio_get_value(gpio);
}
-static inline void gpio_set_value_cansleep(unsigned gpio, int value) {
+static inline void
+gpio_set_value_cansleep(unsigned gpio, int value)
+{
might_sleep();
gpio_set_value(gpio, value);
}
-
#endif
-
diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h
index f178abf48..98d8902fb 100644
--- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h
+++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/irq.h
@@ -1,6 +1,4 @@
/*
- * include/asm-mips/mach-ifxmips/irq.h
- *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
@@ -16,7 +14,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
*
* Copyright (C) 2007 John Crispin <blogic@openwrt.org>
- *
*/
#ifndef __IFXMIPS_IRQ_H
diff --git a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h
index de3584ecf..077a3f4f8 100644
--- a/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h
+++ b/target/linux/ifxmips/files/include/asm-mips/mach-ifxmips/war.h
@@ -1,9 +1,21 @@
/*
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) 2007 John Crispin <blogic@openwrt.org>
*/
+
#ifndef __ASM_MIPS_MACH_IFXMIPS_WAR_H
#define __ASM_MIPS_MACH_IFXMIPS_WAR_H
--
cgit v1.2.3