[PATCH RFC 07/17 v2] staging: dgap: Merge dgap_parse.h into dgap-driver.h

Mark Hounschell markh at compro.net
Wed Feb 12 20:53:37 UTC 2014


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. 

Merge dgap_parse.h into dgap-driver.h

Signed-off-by: Mark Hounschell <markh at compro.net>
Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>

 drivers/staging/dgap/dgap_driver.c |    1 
 drivers/staging/dgap/dgap_driver.h |   11 ++++++++
 drivers/staging/dgap/dgap_parse.h  |   35 ---------------------------
 drivers/staging/dgap/dgap_sysfs.c  |    3 --
 drivers/staging/dgap/dgap_tty.c    |    1 
 5 files changed, 12 insertions(+), 39 deletions(-)

diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.c	2014-02-10 15:39:27.824827207 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.c	2014-02-10 16:13:01.708232345 -0500
@@ -64,7 +64,6 @@
 #include "dgap_pci.h"
 #include "dgap_tty.h"
 #include "dgap_conf.h"
-#include "dgap_parse.h"
 #include "dgap_trace.h"
 #include "dgap_sysfs.h"
 
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.h linux-3.13.1-new/drivers/staging/dgap/dgap_driver.h
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_driver.h	2014-02-10 15:05:14.805390665 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_driver.h	2014-02-10 15:59:36.576837789 -0500
@@ -598,6 +598,17 @@ extern wait_queue_head_t dgap_dl_wait;
 extern int		dgap_dl_action;		/* Action flag for downloader	*/
 extern int		dgap_registerttyswithsysfs; /* Should we register the	*/
 						    /* ttys with sysfs or not	*/
+						    
+/*
+ * Functions from dgap_parsefile
+ */						    
+extern int dgap_parsefile(char **in, int Remove);
+extern struct cnode *dgap_find_config(int type, int bus, int slot);
+extern uint dgap_config_get_number_of_ports(struct board_t *bd);
+extern char *dgap_create_config_string(struct board_t *bd, char *string);
+extern char *dgap_get_config_letters(struct board_t *bd, char *string);
+extern uint dgap_config_get_useintr(struct board_t *bd);
+extern uint dgap_config_get_altpin(struct board_t *bd);						    
 
 /*
  * Global functions declared in dgap_fep5.c, but must be hidden from
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_parse.h linux-3.13.1-new/drivers/staging/dgap/dgap_parse.h
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_parse.h	2014-01-29 08:06:37.000000000 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_parse.h	1969-12-31 19:00:00.000000000 -0500
@@ -1,35 +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_PARSE_H
-#define _DGAP_PARSE_H
-
-#include "dgap_driver.h"
-
-extern int dgap_parsefile(char **in, int Remove);
-extern struct cnode *dgap_find_config(int type, int bus, int slot);
-extern uint dgap_config_get_number_of_ports(struct board_t *bd);
-extern char *dgap_create_config_string(struct board_t *bd, char *string);
-extern char *dgap_get_config_letters(struct board_t *bd, char *string);
-extern uint dgap_config_get_useintr(struct board_t *bd);
-extern uint dgap_config_get_altpin(struct board_t *bd);
-
-#endif
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_sysfs.c linux-3.13.1-new/drivers/staging/dgap/dgap_sysfs.c
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_sysfs.c	2014-01-29 08:06:37.000000000 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_sysfs.c	2014-02-10 16:06:15.024308876 -0500
@@ -29,7 +29,7 @@
  *
  *
  * 
- * $Id: dgap_sysfs.c,v 1.1 2009/10/23 14:01:57 markh Exp $   
+ * $Id: dgap_sysfs.c,v 1.1.1.1 2014/01/31 07:33:31 markh Exp $   
  */
 
 
@@ -44,7 +44,6 @@
   
 #include "dgap_driver.h"
 #include "dgap_conf.h"
-#include "dgap_parse.h"
 
 
 static ssize_t dgap_driver_version_show(struct device_driver *ddp, char *buf)
diff -urpN linux-3.13.1-orig/drivers/staging/dgap/dgap_tty.c linux-3.13.1-new/drivers/staging/dgap/dgap_tty.c
--- linux-3.13.1-orig/drivers/staging/dgap/dgap_tty.c	2014-02-10 15:04:58.492436632 -0500
+++ linux-3.13.1-new/drivers/staging/dgap/dgap_tty.c	2014-02-10 16:06:28.274003240 -0500
@@ -56,7 +56,6 @@
 #include "dgap_driver.h"
 #include "dgap_tty.h"
 #include "dgap_types.h"
-#include "dgap_parse.h"
 #include "dgap_conf.h"
 #include "dgap_sysfs.h"
 




More information about the devel mailing list