leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: dgap: Merge dgap_sysfs.h into dgap_driver.c

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:05 -05:00 committed by Greg Kroah-Hartman
parent 4aeafa8761
commit 30580a78a9
3 changed files with 21 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,7 +54,6 @@
#include "dgap_fep5.h"
#include "dgap_conf.h"
#include "dgap_parse.h"
#include "dgap_sysfs.h"
#include "dgap_types.h"
#define init_MUTEX(sem) sema_init(sem, 1)
@ -152,6 +151,27 @@ static struct cnode *dgap_newnode(int t);
static int dgap_checknode(struct cnode *p);
static void dgap_err(char *s);
/*
* Function prototypes from dgap_sysfs.h
*/
struct board_t;
struct channel_t;
struct un_t;
struct pci_driver;
struct class_device;
void dgap_create_ports_sysfiles(struct board_t *bd);
void dgap_remove_ports_sysfiles(struct board_t *bd);
void dgap_create_driver_sysfiles(struct pci_driver *);
void dgap_remove_driver_sysfiles(struct pci_driver *);
int dgap_tty_class_init(void);
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);
/* Driver load/unload functions */
int dgap_init_module(void);
void dgap_cleanup_module(void);

1
drivers/staging/dgap/dgap_driver.h
View File

@ -34,7 +34,6 @@
#include "dgap_types.h" /* Additional types needed by the Digi header files */
#include "digi.h" /* Digi specific ioctl header */
#include "dgap_kcompat.h" /* Kernel 2.4/2.6 compat includes */
#include "dgap_sysfs.h" /* Support for SYSFS */
/*************************************************************************
*

48
drivers/staging/dgap/dgap_sysfs.h
View File

@ -1,48 +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_SYSFS_H
#define __DGAP_SYSFS_H
#include "dgap_driver.h"
#include <linux/device.h>
struct board_t;
struct channel_t;
struct un_t;
struct pci_driver;
struct class_device;
extern void dgap_create_ports_sysfiles(struct board_t *bd);
extern void dgap_remove_ports_sysfiles(struct board_t *bd);
extern void dgap_create_driver_sysfiles(struct pci_driver *);
extern void dgap_remove_driver_sysfiles(struct pci_driver *);
extern int dgap_tty_class_init(void);
extern int dgap_tty_class_destroy(void);
extern void dgap_create_tty_sysfs(struct un_t *un, struct device *c);
extern void dgap_remove_tty_sysfs(struct device *c);
#endif