diff options
Diffstat (limited to 'include/net/irda')
| -rw-r--r-- | include/net/irda/discovery.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_core.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_event.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_lmp.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_param.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_ttp.h | 4 | ||||
| -rw-r--r-- | include/net/irda/ircomm_tty.h | 18 | ||||
| -rw-r--r-- | include/net/irda/ircomm_tty_attach.h | 4 | ||||
| -rw-r--r-- | include/net/irda/irda.h | 21 | ||||
| -rw-r--r-- | include/net/irda/irda_device.h | 6 | ||||
| -rw-r--r-- | include/net/irda/irlap_event.h | 6 | ||||
| -rw-r--r-- | include/net/irda/irlap_frame.h | 8 | ||||
| -rw-r--r-- | include/net/irda/parameters.h | 4 | ||||
| -rw-r--r-- | include/net/irda/qos.h | 4 | 
14 files changed, 34 insertions, 61 deletions
diff --git a/include/net/irda/discovery.h b/include/net/irda/discovery.h index 0ce93398720..63ae3253056 100644 --- a/include/net/irda/discovery.h +++ b/include/net/irda/discovery.h @@ -23,9 +23,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_core.h b/include/net/irda/ircomm_core.h index 69b610acd2d..2a580ce9eda 100644 --- a/include/net/irda/ircomm_core.h +++ b/include/net/irda/ircomm_core.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_event.h b/include/net/irda/ircomm_event.h index bc0c6f31f1c..5bbc32998d5 100644 --- a/include/net/irda/ircomm_event.h +++ b/include/net/irda/ircomm_event.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_lmp.h b/include/net/irda/ircomm_lmp.h index ae02106be59..5042a5021a0 100644 --- a/include/net/irda/ircomm_lmp.h +++ b/include/net/irda/ircomm_lmp.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_param.h b/include/net/irda/ircomm_param.h index e6678800c41..1f67432321c 100644 --- a/include/net/irda/ircomm_param.h +++ b/include/net/irda/ircomm_param.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_ttp.h b/include/net/irda/ircomm_ttp.h index 403081ed725..c5627288bca 100644 --- a/include/net/irda/ircomm_ttp.h +++ b/include/net/irda/ircomm_ttp.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h index 80ffde3bb16..8d4f588974b 100644 --- a/include/net/irda/ircomm_tty.h +++ b/include/net/irda/ircomm_tty.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ @@ -105,13 +103,13 @@ struct ircomm_tty_cb {  void ircomm_tty_start(struct tty_struct *tty);  void ircomm_tty_check_modem_status(struct ircomm_tty_cb *self); -extern int ircomm_tty_tiocmget(struct tty_struct *tty); -extern int ircomm_tty_tiocmset(struct tty_struct *tty, -			       unsigned int set, unsigned int clear); -extern int ircomm_tty_ioctl(struct tty_struct *tty,  -			    unsigned int cmd, unsigned long arg); -extern void ircomm_tty_set_termios(struct tty_struct *tty,  -				   struct ktermios *old_termios); +int ircomm_tty_tiocmget(struct tty_struct *tty); +int ircomm_tty_tiocmset(struct tty_struct *tty, unsigned int set, +			unsigned int clear); +int ircomm_tty_ioctl(struct tty_struct *tty, unsigned int cmd, +		     unsigned long arg); +void ircomm_tty_set_termios(struct tty_struct *tty, +			    struct ktermios *old_termios);  #endif diff --git a/include/net/irda/ircomm_tty_attach.h b/include/net/irda/ircomm_tty_attach.h index 0a63bbb972d..20dcbdf258c 100644 --- a/include/net/irda/ircomm_tty_attach.h +++ b/include/net/irda/ircomm_tty_attach.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ diff --git a/include/net/irda/irda.h b/include/net/irda/irda.h index 3bed61d379a..a059465101f 100644 --- a/include/net/irda/irda.h +++ b/include/net/irda/irda.h @@ -112,20 +112,19 @@ do { if(!(expr)) { \  struct net_device;  struct packet_type; -extern void irda_proc_register(void); -extern void irda_proc_unregister(void); +void irda_proc_register(void); +void irda_proc_unregister(void); -extern int irda_sysctl_register(void); -extern void irda_sysctl_unregister(void); +int irda_sysctl_register(void); +void irda_sysctl_unregister(void); -extern int irsock_init(void); -extern void irsock_cleanup(void); +int irsock_init(void); +void irsock_cleanup(void); -extern int irda_nl_register(void); -extern void irda_nl_unregister(void); +int irda_nl_register(void); +void irda_nl_unregister(void); -extern int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev, -			    struct packet_type *ptype, -			    struct net_device *orig_dev); +int irlap_driver_rcv(struct sk_buff *skb, struct net_device *dev, +		     struct packet_type *ptype, struct net_device *orig_dev);  #endif /* NET_IRDA_H */ diff --git a/include/net/irda/irda_device.h b/include/net/irda/irda_device.h index 94c852d47d0..664bf817841 100644 --- a/include/net/irda/irda_device.h +++ b/include/net/irda/irda_device.h @@ -24,9 +24,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ @@ -162,7 +160,7 @@ typedef struct {          int irq, irq2;        /* Interrupts used */          int dma, dma2;        /* DMA channel(s) used */          int fifo_size;        /* FIFO size */ -        int irqflags;         /* interrupt flags (ie, IRQF_SHARED|IRQF_DISABLED) */ +        int irqflags;         /* interrupt flags (ie, IRQF_SHARED) */  	int direction;        /* Link direction, used by some FIR drivers */  	int enabled;          /* Powered on? */  	int suspended;        /* Suspended by APM */ diff --git a/include/net/irda/irlap_event.h b/include/net/irda/irlap_event.h index 4c90824c50f..e4325fee126 100644 --- a/include/net/irda/irlap_event.h +++ b/include/net/irda/irlap_event.h @@ -25,9 +25,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ @@ -126,6 +124,6 @@ void irlap_do_event(struct irlap_cb *self, IRLAP_EVENT event,  		    struct sk_buff *skb, struct irlap_info *info);  void irlap_print_event(IRLAP_EVENT event); -extern int irlap_qos_negotiate(struct irlap_cb *self, struct sk_buff *skb); +int irlap_qos_negotiate(struct irlap_cb *self, struct sk_buff *skb);  #endif diff --git a/include/net/irda/irlap_frame.h b/include/net/irda/irlap_frame.h index 6b1dc4f8eca..cbc12a926e5 100644 --- a/include/net/irda/irlap_frame.h +++ b/include/net/irda/irlap_frame.h @@ -24,9 +24,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/ @@ -163,7 +161,7 @@ void irlap_resend_rejected_frame(struct irlap_cb *self, int command);  void irlap_send_ui_frame(struct irlap_cb *self, struct sk_buff *skb,  			 __u8 caddr, int command); -extern int irlap_insert_qos_negotiation_params(struct irlap_cb *self,  -					       struct sk_buff *skb); +int irlap_insert_qos_negotiation_params(struct irlap_cb *self, +					struct sk_buff *skb);  #endif diff --git a/include/net/irda/parameters.h b/include/net/irda/parameters.h index c0d938847bd..42713c931d1 100644 --- a/include/net/irda/parameters.h +++ b/include/net/irda/parameters.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *   *     Michel Dänzer <daenzer@debian.org>, 10/2001   *     - simplify irda_pv_t to avoid endianness issues diff --git a/include/net/irda/qos.h b/include/net/irda/qos.h index cc577dc0a0e..05a5a249956 100644 --- a/include/net/irda/qos.h +++ b/include/net/irda/qos.h @@ -22,9 +22,7 @@   *     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 + *     along with this program; if not, see <http://www.gnu.org/licenses/>.   *        ********************************************************************/  | 
