Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-02 18:21:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: dgnc: renames board_t to dgnc_board

Browse Source 
This patch renames the struct board_t to dgnc_board. board_t
wasn't a good name for it since the _t suffix is for typedefs.

Signed-off-by: Lidza Louina <lidza.louina@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lidza Louina 2013-09-09 15:01:22 -04:00 committed by Greg Kroah-Hartman
parent 538118b94f
commit 03425f55a1
8 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/staging/dgnc/dgnc_cls.c
View File

@ -43,7 +43,7 @@
#include "dgnc_tty.h"
#include "dgnc_trace.h"
static inline void cls_parse_isr(struct board_t *brd, uint port);
static inline void cls_parse_isr(struct dgnc_board *brd, uint port);
static inline void cls_clear_break(struct channel_t *ch, int force);
static inline void cls_set_cts_flow_control(struct channel_t *ch);
static inline void cls_set_rts_flow_control(struct channel_t *ch);
@ -53,7 +53,7 @@ static inline void cls_set_no_output_flow_control(struct channel_t *ch);
static inline void cls_set_no_input_flow_control(struct channel_t *ch);
static void cls_parse_modem(struct channel_t *ch, uchar signals);
static void cls_tasklet(unsigned long data);
static void cls_vpd(struct board_t *brd);
static void cls_vpd(struct dgnc_board *brd);
static void cls_uart_init(struct channel_t *ch);
static void cls_uart_off(struct channel_t *ch);
static int cls_drain(struct tty_struct *tty, uint seconds);
@ -393,7 +393,7 @@ static inline void cls_clear_break(struct channel_t *ch, int force)
/* Parse the ISR register for the specific port */
static inline void cls_parse_isr(struct board_t *brd, uint port)
static inline void cls_parse_isr(struct dgnc_board *brd, uint port)
{
struct channel_t *ch;
uchar isr = 0;
@ -477,7 +477,7 @@ static void cls_param(struct tty_struct *tty)
uchar uart_ier = 0;
uint baud = 9600;
int quot = 0;
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -725,7 +725,7 @@ static void cls_param(struct tty_struct *tty)
*/
static void cls_tasklet(unsigned long data)
{
struct board_t *bd = (struct board_t *) data;
struct dgnc_board *bd = (struct dgnc_board *) data;
struct channel_t *ch;
ulong lock_flags;
int i;
@ -802,7 +802,7 @@ static void cls_tasklet(unsigned long data)
*/
static irqreturn_t cls_intr(int irq, void *voidbrd)
{
struct board_t *brd = (struct board_t *) voidbrd;
struct dgnc_board *brd = (struct dgnc_board *) voidbrd;
uint i = 0;
uchar poll_reg;
unsigned long lock_flags;
@ -1378,7 +1378,7 @@ static void cls_send_immediate_char(struct channel_t *ch, unsigned char c)
writeb(c, &ch->ch_cls_uart->txrx);
}
static void cls_vpd(struct board_t *brd)
static void cls_vpd(struct dgnc_board *brd)
{
ulong vpdbase; /* Start of io base of the card */
u8 __iomem *re_map_vpdbase;/* Remapped memory of the card */

20
drivers/staging/dgnc/dgnc_driver.c
View File

@ -71,16 +71,16 @@ PARM_INT(trcbuf_size, 0x100000, 0644, "Debugging trace buffer size.");
*
*/
static int dgnc_start(void);
static int dgnc_finalize_board_init(struct board_t *brd);
static int dgnc_finalize_board_init(struct dgnc_board *brd);
static void dgnc_init_globals(void);
static int dgnc_found_board(struct pci_dev *pdev, int id);
static void dgnc_cleanup_board(struct board_t *brd);
static void dgnc_cleanup_board(struct dgnc_board *brd);
static void dgnc_poll_handler(ulong dummy);
static int dgnc_init_pci(void);
static int dgnc_init_one(struct pci_dev *pdev, const struct pci_device_id *ent);
static void dgnc_remove_one(struct pci_dev *dev);
static int dgnc_probe1(struct pci_dev *pdev, int card_type);
static void dgnc_do_remap(struct board_t *brd);
static void dgnc_do_remap(struct dgnc_board *brd);
/* Driver load/unload functions */
int dgnc_init_module(void);
@ -106,7 +106,7 @@ static struct file_operations dgnc_BoardFops =
* Globals
*/
uint dgnc_NumBoards;
struct board_t *dgnc_Board[MAXBOARDS];
struct dgnc_board *dgnc_Board[MAXBOARDS];
DEFINE_SPINLOCK(dgnc_global_lock);
int dgnc_driver_state = DRIVER_INITIALIZED;
ulong dgnc_poll_counter;
@ -418,7 +418,7 @@ void dgnc_cleanup_module(void)
*
* Free all the memory associated with a board
*/
static void dgnc_cleanup_board(struct board_t *brd)
static void dgnc_cleanup_board(struct dgnc_board *brd)
{
int i = 0;
@ -491,7 +491,7 @@ static void dgnc_cleanup_board(struct board_t *brd)
*/
static int dgnc_found_board(struct pci_dev *pdev, int id)
{
struct board_t *brd;
struct dgnc_board *brd;
unsigned int pci_irq;
int i = 0;
int rc = 0;
@ -499,7 +499,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
/* get the board structure and prep it */
brd = dgnc_Board[dgnc_NumBoards] =
(struct board_t *) kzalloc(sizeof(struct board_t), GFP_KERNEL);
(struct dgnc_board *) kzalloc(sizeof(struct dgnc_board), GFP_KERNEL);
if (!brd) {
APR(("memory allocation for board structure failed\n"));
return(-ENOMEM);
@ -734,7 +734,7 @@ failed:
}
static int dgnc_finalize_board_init(struct board_t *brd) {
static int dgnc_finalize_board_init(struct dgnc_board *brd) {
int rc = 0;
DPR_INIT(("dgnc_finalize_board_init() - start\n"));
@ -762,7 +762,7 @@ static int dgnc_finalize_board_init(struct board_t *brd) {
/*
* Remap PCI memory.
*/
static void dgnc_do_remap(struct board_t *brd)
static void dgnc_do_remap(struct dgnc_board *brd)
{
if (!brd || brd->magic != DGNC_BOARD_MAGIC)
@ -802,7 +802,7 @@ static void dgnc_do_remap(struct board_t *brd)
static void dgnc_poll_handler(ulong dummy)
{
struct board_t *brd;
struct dgnc_board *brd;
unsigned long lock_flags;
int i;
unsigned long new_time;

10
drivers/staging/dgnc/dgnc_driver.h
View File

@ -246,7 +246,7 @@ enum {
*
*************************************************************************/
struct board_t;
struct dgnc_board;
struct channel_t;
/************************************************************************
@ -259,7 +259,7 @@ struct board_ops {
void (*uart_off) (struct channel_t *ch);
int (*drain) (struct tty_struct *tty, uint seconds);
void (*param) (struct tty_struct *tty);
void (*vpd) (struct board_t *brd);
void (*vpd) (struct dgnc_board *brd);
void (*assert_modem_signals) (struct channel_t *ch);
void (*flush_uart_write) (struct channel_t *ch);
void (*flush_uart_read) (struct channel_t *ch);
@ -282,7 +282,7 @@ struct board_ops {
/*
* Per-board information
*/
struct board_t {
struct dgnc_board {
int magic; /* Board Magic number. */
int boardnum; /* Board number: 0-32 */
@ -449,7 +449,7 @@ struct un_t {
************************************************************************/
struct channel_t {
int magic; /* Channel Magic Number */
struct board_t *ch_bd; /* Board structure pointer */
struct dgnc_board *ch_bd; /* Board structure pointer */
struct digi_t ch_digi; /* Transparent Print structure */
struct un_t ch_tun; /* Terminal unit info */
struct un_t ch_pun; /* Printer unit info */
@ -555,7 +555,7 @@ extern int dgnc_poll_tick; /* Poll interval - 20 ms */
extern int dgnc_trcbuf_size; /* Size of the ringbuffer */
extern spinlock_t dgnc_global_lock; /* Driver global spinlock */
extern uint dgnc_NumBoards; /* Total number of boards */
extern struct board_t *dgnc_Board[MAXBOARDS]; /* Array of board structs */
extern struct dgnc_board *dgnc_Board[MAXBOARDS]; /* Array of board structs */
extern ulong dgnc_poll_counter; /* Times the poller has run */
extern char *dgnc_state_text[]; /* Array of state text */
extern char *dgnc_driver_state_text[];/* Array of driver state text */

20
drivers/staging/dgnc/dgnc_neo.c
View File

@ -43,8 +43,8 @@
#include "dgnc_tty.h"
#include "dgnc_trace.h"
static inline void neo_parse_lsr(struct board_t *brd, uint port);
static inline void neo_parse_isr(struct board_t *brd, uint port);
static inline void neo_parse_lsr(struct dgnc_board *brd, uint port);
static inline void neo_parse_isr(struct dgnc_board *brd, uint port);
static void neo_copy_data_from_uart_to_queue(struct channel_t *ch);
static inline void neo_clear_break(struct channel_t *ch, int force);
static inline void neo_set_cts_flow_control(struct channel_t *ch);
@ -56,7 +56,7 @@ static inline void neo_set_no_input_flow_control(struct channel_t *ch);
static inline void neo_set_new_start_stop_chars(struct channel_t *ch);
static void neo_parse_modem(struct channel_t *ch, uchar signals);
static void neo_tasklet(unsigned long data);
static void neo_vpd(struct board_t *brd);
static void neo_vpd(struct dgnc_board *brd);
static void neo_uart_init(struct channel_t *ch);
static void neo_uart_off(struct channel_t *ch);
static int neo_drain(struct tty_struct *tty, uint seconds);
@ -107,7 +107,7 @@ static uint dgnc_offset_table[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0
* In this case, we are reading the DVID (Read-only Device Identification)
* value of the Neo card.
*/
static inline void neo_pci_posting_flush(struct board_t *bd)
static inline void neo_pci_posting_flush(struct dgnc_board *bd)
{
readb(bd->re_map_membase + 0x8D);
}
@ -411,7 +411,7 @@ static inline void neo_clear_break(struct channel_t *ch, int force)
/*
* Parse the ISR register.
*/
static inline void neo_parse_isr(struct board_t *brd, uint port)
static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
{
struct channel_t *ch;
uchar isr;
@ -538,7 +538,7 @@ static inline void neo_parse_isr(struct board_t *brd, uint port)
}
static inline void neo_parse_lsr(struct board_t *brd, uint port)
static inline void neo_parse_lsr(struct dgnc_board *brd, uint port)
{
struct channel_t *ch;
int linestatus;
@ -650,7 +650,7 @@ static void neo_param(struct tty_struct *tty)
uchar uart_ier = 0;
uint baud = 9600;
int quot = 0;
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -911,7 +911,7 @@ static void neo_param(struct tty_struct *tty)
*/
static void neo_tasklet(unsigned long data)
{
struct board_t *bd = (struct board_t *) data;
struct dgnc_board *bd = (struct dgnc_board *) data;
struct channel_t *ch;
ulong lock_flags;
int i;
@ -994,7 +994,7 @@ static void neo_tasklet(unsigned long data)
*/
static irqreturn_t neo_intr(int irq, void *voidbrd)
{
struct board_t *brd = (struct board_t *) voidbrd;
struct dgnc_board *brd = (struct dgnc_board *) voidbrd;
struct channel_t *ch;
int port = 0;
int type = 0;
@ -1939,7 +1939,7 @@ static unsigned int neo_read_eeprom(unsigned char __iomem *base, unsigned int ad
}
static void neo_vpd(struct board_t *brd)
static void neo_vpd(struct dgnc_board *brd)
{
unsigned int i = 0;
unsigned int a;

50
drivers/staging/dgnc/dgnc_sysfs.c
View File

@ -164,7 +164,7 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
static ssize_t dgnc_vpd_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -184,7 +184,7 @@ static DEVICE_ATTR(vpd, S_IRUSR, dgnc_vpd_show, NULL);
static ssize_t dgnc_serial_number_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
DGNC_VERIFY_BOARD(p, bd);
@ -201,7 +201,7 @@ static DEVICE_ATTR(serial_number, S_IRUSR, dgnc_serial_number_show, NULL);
static ssize_t dgnc_ports_state_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -219,7 +219,7 @@ static DEVICE_ATTR(ports_state, S_IRUSR, dgnc_ports_state_show, NULL);
static ssize_t dgnc_ports_baud_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -236,7 +236,7 @@ static DEVICE_ATTR(ports_baud, S_IRUSR, dgnc_ports_baud_show, NULL);
static ssize_t dgnc_ports_msignals_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -264,7 +264,7 @@ static DEVICE_ATTR(ports_msignals, S_IRUSR, dgnc_ports_msignals_show, NULL);
static ssize_t dgnc_ports_iflag_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -281,7 +281,7 @@ static DEVICE_ATTR(ports_iflag, S_IRUSR, dgnc_ports_iflag_show, NULL);
static ssize_t dgnc_ports_cflag_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -298,7 +298,7 @@ static DEVICE_ATTR(ports_cflag, S_IRUSR, dgnc_ports_cflag_show, NULL);
static ssize_t dgnc_ports_oflag_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -315,7 +315,7 @@ static DEVICE_ATTR(ports_oflag, S_IRUSR, dgnc_ports_oflag_show, NULL);
static ssize_t dgnc_ports_lflag_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -332,7 +332,7 @@ static DEVICE_ATTR(ports_lflag, S_IRUSR, dgnc_ports_lflag_show, NULL);
static ssize_t dgnc_ports_digi_flag_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -349,7 +349,7 @@ static DEVICE_ATTR(ports_digi_flag, S_IRUSR, dgnc_ports_digi_flag_show, NULL);
static ssize_t dgnc_ports_rxcount_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -366,7 +366,7 @@ static DEVICE_ATTR(ports_rxcount, S_IRUSR, dgnc_ports_rxcount_show, NULL);
static ssize_t dgnc_ports_txcount_show(struct device *p, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
int count = 0;
int i = 0;
@ -384,7 +384,7 @@ static DEVICE_ATTR(ports_txcount, S_IRUSR, dgnc_ports_txcount_show, NULL);
/* this function creates the sys files that will export each signal status
* to sysfs each value will be put in a separate filename
*/
void dgnc_create_ports_sysfiles(struct board_t *bd)
void dgnc_create_ports_sysfiles(struct dgnc_board *bd)
{
int rc = 0;
@ -408,7 +408,7 @@ void dgnc_create_ports_sysfiles(struct board_t *bd)
/* removes all the sys files created for that port */
void dgnc_remove_ports_sysfiles(struct board_t *bd)
void dgnc_remove_ports_sysfiles(struct dgnc_board *bd)
{
device_remove_file(&(bd->pdev->dev), &dev_attr_ports_state);
device_remove_file(&(bd->pdev->dev), &dev_attr_ports_baud);
@ -427,7 +427,7 @@ void dgnc_remove_ports_sysfiles(struct board_t *bd)
static ssize_t dgnc_tty_state_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -452,7 +452,7 @@ static DEVICE_ATTR(state, S_IRUSR, dgnc_tty_state_show, NULL);
static ssize_t dgnc_tty_baud_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -477,7 +477,7 @@ static DEVICE_ATTR(baud, S_IRUSR, dgnc_tty_baud_show, NULL);
static ssize_t dgnc_tty_msignals_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -511,7 +511,7 @@ static DEVICE_ATTR(msignals, S_IRUSR, dgnc_tty_msignals_show, NULL);
static ssize_t dgnc_tty_iflag_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -536,7 +536,7 @@ static DEVICE_ATTR(iflag, S_IRUSR, dgnc_tty_iflag_show, NULL);
static ssize_t dgnc_tty_cflag_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -561,7 +561,7 @@ static DEVICE_ATTR(cflag, S_IRUSR, dgnc_tty_cflag_show, NULL);
static ssize_t dgnc_tty_oflag_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -586,7 +586,7 @@ static DEVICE_ATTR(oflag, S_IRUSR, dgnc_tty_oflag_show, NULL);
static ssize_t dgnc_tty_lflag_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -611,7 +611,7 @@ static DEVICE_ATTR(lflag, S_IRUSR, dgnc_tty_lflag_show, NULL);
static ssize_t dgnc_tty_digi_flag_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -636,7 +636,7 @@ static DEVICE_ATTR(digi_flag, S_IRUSR, dgnc_tty_digi_flag_show, NULL);
static ssize_t dgnc_tty_rxcount_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -661,7 +661,7 @@ static DEVICE_ATTR(rxcount, S_IRUSR, dgnc_tty_rxcount_show, NULL);
static ssize_t dgnc_tty_txcount_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
@ -686,7 +686,7 @@ static DEVICE_ATTR(txcount, S_IRUSR, dgnc_tty_txcount_show, NULL);
static ssize_t dgnc_tty_name_show(struct device *d, struct device_attribute *attr, char *buf)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;

6
drivers/staging/dgnc/dgnc_sysfs.h
View File

@ -26,14 +26,14 @@
#include <linux/device.h>
struct board_t;
struct dgnc_board;
struct channel_t;
struct un_t;
struct pci_driver;
struct class_device;
extern void dgnc_create_ports_sysfiles(struct board_t *bd);
extern void dgnc_remove_ports_sysfiles(struct board_t *bd);
extern void dgnc_create_ports_sysfiles(struct dgnc_board *bd);
extern void dgnc_remove_ports_sysfiles(struct dgnc_board *bd);
extern void dgnc_create_driver_sysfiles(struct pci_driver *);
extern void dgnc_remove_driver_sysfiles(struct pci_driver *);

38
drivers/staging/dgnc/dgnc_tty.c
View File

@ -69,7 +69,7 @@
/*
* internal variables
*/
static struct board_t *dgnc_BoardsByMajor[256];
static struct dgnc_board *dgnc_BoardsByMajor[256];
static uchar *dgnc_TmpWriteBuf = NULL;
static DECLARE_MUTEX(dgnc_TmpWriteSem);
@ -202,7 +202,7 @@ int dgnc_tty_preinit(void)
*
* Init the tty subsystem for this board.
*/
int dgnc_tty_register(struct board_t *brd)
int dgnc_tty_register(struct dgnc_board *brd)
{
int rc = 0;
@ -341,7 +341,7 @@ int dgnc_tty_register(struct board_t *brd)
* Init the tty subsystem. Called once per board after board has been
* downloaded and init'ed.
*/
int dgnc_tty_init(struct board_t *brd)
int dgnc_tty_init(struct dgnc_board *brd)
{
int i;
void __iomem *vaddr;
@ -460,7 +460,7 @@ void dgnc_tty_post_uninit(void)
* Uninitialize the TTY portion of this driver. Free all memory and
* resources.
*/
void dgnc_tty_uninit(struct board_t *brd)
void dgnc_tty_uninit(struct dgnc_board *brd)
{
int i = 0;
@ -671,7 +671,7 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n)
*=======================================================================*/
void dgnc_input(struct channel_t *ch)
{
struct board_t *bd;
struct dgnc_board *bd;
struct tty_struct *tp;
struct tty_ldisc *ld;
uint rmask;
@ -867,7 +867,7 @@ void dgnc_input(struct channel_t *ch)
************************************************************************/
void dgnc_carrier(struct channel_t *ch)
{
struct board_t *bd;
struct dgnc_board *bd;
int virt_carrier = 0;
int phys_carrier = 0;
@ -1260,7 +1260,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)
*/
static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
{
struct board_t *brd;
struct dgnc_board *brd;
struct channel_t *ch;
struct un_t *un;
uint major = 0;
@ -1667,7 +1667,7 @@ static void dgnc_tty_hangup(struct tty_struct *tty)
static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
{
struct ktermios *ts;
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
ulong lock_flags;
@ -2301,7 +2301,7 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
#endif
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
int ret = -EIO;
@ -2360,7 +2360,7 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty, struct file *file,
*/
static int dgnc_tty_send_break(struct tty_struct *tty, int msec)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
int ret = -EIO;
@ -2414,7 +2414,7 @@ static int dgnc_tty_send_break(struct tty_struct *tty, int msec)
*/
static void dgnc_tty_wait_until_sent(struct tty_struct *tty, int timeout)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
int rc;
@ -2450,7 +2450,7 @@ static void dgnc_tty_wait_until_sent(struct tty_struct *tty, int timeout)
*/
static void dgnc_tty_send_xchar(struct tty_struct *tty, char c)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
ulong lock_flags;
@ -2559,7 +2559,7 @@ static int dgnc_get_modem_info(struct channel_t *ch, unsigned int __user *value
*/
static int dgnc_set_modem_info(struct tty_struct *tty, unsigned int command, unsigned int __user *value)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
int ret = -ENXIO;
@ -2698,7 +2698,7 @@ static int dgnc_tty_digigeta(struct tty_struct *tty, struct digi_t __user *retin
*/
static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_info)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
struct digi_t new_digi;
@ -2782,7 +2782,7 @@ static int dgnc_tty_digiseta(struct tty_struct *tty, struct digi_t __user *new_i
*/
static void dgnc_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
unsigned long lock_flags;
@ -2878,7 +2878,7 @@ static void dgnc_tty_unthrottle(struct tty_struct *tty)
static void dgnc_tty_start(struct tty_struct *tty)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
ulong lock_flags;
@ -2912,7 +2912,7 @@ static void dgnc_tty_start(struct tty_struct *tty)
static void dgnc_tty_stop(struct tty_struct *tty)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
ulong lock_flags;
@ -2959,7 +2959,7 @@ static void dgnc_tty_stop(struct tty_struct *tty)
*/
static void dgnc_tty_flush_chars(struct tty_struct *tty)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
ulong lock_flags;
@ -3056,7 +3056,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)
static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned long arg)
{
struct board_t *bd;
struct dgnc_board *bd;
struct channel_t *ch;
struct un_t *un;
int rc;

6
drivers/staging/dgnc/dgnc_tty.h
View File

@ -24,13 +24,13 @@
#include "dgnc_driver.h"
int dgnc_tty_register(struct board_t *brd);
int dgnc_tty_register(struct dgnc_board *brd);
int dgnc_tty_preinit(void);
int dgnc_tty_init(struct board_t *);
int dgnc_tty_init(struct dgnc_board *);
void dgnc_tty_post_uninit(void);
void dgnc_tty_uninit(struct board_t *);
void dgnc_tty_uninit(struct dgnc_board *);
void dgnc_input(struct channel_t *ch);
void dgnc_carrier(struct channel_t *ch);