openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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:09 -05:00 committed by Greg Kroah-Hartman
parent e49a00bceb
commit 9e9b3bb769
2 changed files with 11 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/dgap/dgap_driver.c
View File

@ -50,7 +50,6 @@
#include <linux/kdev_t.h>
#include "dgap_driver.h"
#include "dgap_parse.h"
#include "dgap_types.h"
#define init_MUTEX(sem) sema_init(sem, 1)
@ -169,6 +168,17 @@ int dgap_tty_class_destroy(void);
void dgap_create_tty_sysfs(struct un_t *un, struct device *c);
void dgap_remove_tty_sysfs(struct device *c);
/*
* Function prototypes from dgap_parse.h
*/
int dgap_parsefile(char **in, int Remove);
struct cnode *dgap_find_config(int type, int bus, int slot);
uint dgap_config_get_number_of_ports(struct board_t *bd);
char *dgap_create_config_string(struct board_t *bd, char *string);
char *dgap_get_config_letters(struct board_t *bd, char *string);
uint dgap_config_get_useintr(struct board_t *bd);
uint dgap_config_get_altpin(struct board_t *bd);
/* Driver load/unload functions */
int dgap_init_module(void);
void dgap_cleanup_module(void);

35
drivers/staging/dgap/dgap_parse.h
View File

@ -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