evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: dgap: Merge dgap_types.h into dgap_driver.h

Browse source 
There is a lot of cleanup work to do on these digi drivers and merging as
much as is possible will make it easier. I also notice that many merged
drivers are single source and header.

Signed-off-by: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mark Hounschell 2014-02-19 13:12:11 -05:00 • committed by Greg Kroah-Hartman
parent 81d5fb3c59
commit 4c15e811b2
3 changed files with 11 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/dgap/dgap_driver.c
View file

@ -50,7 +50,6 @@
#include <linux/kdev_t.h> #include <linux/kdev_t.h>
#include "dgap_driver.h" #include "dgap_driver.h"
#include "dgap_types.h"
#define init_MUTEX(sem) sema_init(sem, 1) #define init_MUTEX(sem) sema_init(sem, 1)
#define DECLARE_MUTEX(name) \ #define DECLARE_MUTEX(name) \

12
drivers/staging/dgap/dgap_driver.h
View file

@ -31,9 +31,19 @@
#include <linux/tty.h> /* To pick up the various tty structs/defines */ #include <linux/tty.h> /* To pick up the various tty structs/defines */
#include <linux/interrupt.h> /* For irqreturn_t type */ #include <linux/interrupt.h> /* For irqreturn_t type */
#include "dgap_types.h" /* Additional types needed by the Digi header files */
#include "digi.h" /* Digi specific ioctl header */ #include "digi.h" /* Digi specific ioctl header */
#ifndef TRUE
# define TRUE 1
#endif
#ifndef FALSE
# define FALSE 0
#endif
/* Required for our shared headers! */
typedef unsigned char uchar;
#if !defined(TTY_FLIPBUF_SIZE) #if !defined(TTY_FLIPBUF_SIZE)
# define TTY_FLIPBUF_SIZE 512 # define TTY_FLIPBUF_SIZE 512
#endif #endif

36
drivers/staging/dgap/dgap_types.h
View file

@ -1,36 +0,0 @@
/*
* Copyright 2003 Digi International (www.digi.com)
* Scott H Kilau <Scott_Kilau at digi dot com>
*
* 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, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED; 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., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* NOTE: THIS IS A SHARED HEADER. DO NOT CHANGE CODING STYLE!!!
*/
#ifndef __DGAP_TYPES_H
#define __DGAP_TYPES_H
#ifndef TRUE
# define TRUE 1
#endif
#ifndef FALSE
# define FALSE 0
#endif
/* Required for our shared headers! */
typedef unsigned char uchar;
#endif