mirror of
https://github.com/torvalds/linux.git
synced 2024-12-16 08:02:17 +00:00
staging: dgnc: remove multiple blank lines
checkpatch warns us about multiple blank lines which are not needed. Remove them. Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee
Greg Kroah-Hartman
parent
3604af50a2
commit
9753007ed7
@ -13,7 +13,6 @@
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
@ -56,7 +55,6 @@ static const struct file_operations dgnc_BoardFops = {
|
||||
.release = dgnc_mgmt_close
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Globals
|
||||
*/
|
||||
@ -79,7 +77,6 @@ static ulong dgnc_poll_time; /* Time of next poll */
|
||||
static uint dgnc_poll_stop; /* Used to tell poller to stop */
|
||||
static struct timer_list dgnc_poll_timer;
|
||||
|
||||
|
||||
static const struct pci_device_id dgnc_pci_tbl[] = {
|
||||
{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_DID), .driver_data = 0},
|
||||
{PCI_DEVICE(DIGI_VID, PCI_DEVICE_CLASSIC_4_422_DID), .driver_data = 1},
|
||||
@ -354,13 +351,11 @@ static void dgnc_cleanup_board(struct dgnc_board *brd)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
dgnc_Board[brd->boardnum] = NULL;
|
||||
|
||||
kfree(brd);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_found_board()
|
||||
*
|
||||
@ -421,7 +416,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
||||
pci_irq = pdev->irq;
|
||||
brd->irq = pci_irq;
|
||||
|
||||
|
||||
switch (brd->device) {
|
||||
|
||||
case PCI_DEVICE_CLASSIC_4_DID:
|
||||
@ -441,7 +435,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
||||
* 4 Memory Mapped UARTs and Status
|
||||
*/
|
||||
|
||||
|
||||
/* get the PCI Base Address Registers */
|
||||
brd->membase = pci_resource_start(pdev, 4);
|
||||
|
||||
@ -482,7 +475,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)
|
||||
|
||||
break;
|
||||
|
||||
|
||||
case PCI_DEVICE_NEO_4_DID:
|
||||
case PCI_DEVICE_NEO_8_DID:
|
||||
case PCI_DEVICE_NEO_2DB9_DID:
|
||||
@ -592,7 +584,6 @@ failed:
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int dgnc_finalize_board_init(struct dgnc_board *brd)
|
||||
{
|
||||
int rc = 0;
|
||||
@ -627,7 +618,6 @@ static void dgnc_do_remap(struct dgnc_board *brd)
|
||||
brd->re_map_membase = ioremap(brd->membase, 0x1000);
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* Function:
|
||||
|
||||
@ -32,11 +32,9 @@
|
||||
#include "dgnc_pci.h"
|
||||
#include "dgnc_mgmt.h"
|
||||
|
||||
|
||||
/* Our "in use" variables, to enforce 1 open only */
|
||||
static int dgnc_mgmt_in_use[MAXMGMTDEVICES];
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_mgmt_open()
|
||||
*
|
||||
@ -67,7 +65,6 @@ int dgnc_mgmt_open(struct inode *inode, struct file *file)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_mgmt_close()
|
||||
*
|
||||
@ -90,7 +87,6 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_mgmt_ioctl()
|
||||
*
|
||||
@ -256,7 +252,6 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/sched.h> /* For jiffies, task states */
|
||||
#include <linux/interrupt.h> /* For tasklet and interrupt structs/defines */
|
||||
@ -57,7 +56,6 @@ static uint neo_get_uart_bytes_left(struct channel_t *ch);
|
||||
static void neo_send_immediate_char(struct channel_t *ch, unsigned char c);
|
||||
static irqreturn_t neo_intr(int irq, void *voidbrd);
|
||||
|
||||
|
||||
struct board_ops dgnc_neo_ops = {
|
||||
.tasklet = neo_tasklet,
|
||||
.intr = neo_intr,
|
||||
@ -81,7 +79,6 @@ struct board_ops dgnc_neo_ops = {
|
||||
|
||||
static uint dgnc_offset_table[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 };
|
||||
|
||||
|
||||
/*
|
||||
* This function allows calls to ensure that all outstanding
|
||||
* PCI writes have been completed, by doing a PCI read against
|
||||
@ -100,7 +97,6 @@ static inline void neo_set_cts_flow_control(struct channel_t *ch)
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
unsigned char efr = readb(&ch->ch_neo_uart->efr);
|
||||
|
||||
|
||||
/* Turn on auto CTS flow control */
|
||||
#if 1
|
||||
ier |= UART_17158_IER_CTSDSR;
|
||||
@ -131,7 +127,6 @@ static inline void neo_set_cts_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_set_rts_flow_control(struct channel_t *ch)
|
||||
{
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
@ -174,7 +169,6 @@ static inline void neo_set_rts_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_set_ixon_flow_control(struct channel_t *ch)
|
||||
{
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
@ -211,7 +205,6 @@ static inline void neo_set_ixon_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_set_ixoff_flow_control(struct channel_t *ch)
|
||||
{
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
@ -249,7 +242,6 @@ static inline void neo_set_ixoff_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_set_no_input_flow_control(struct channel_t *ch)
|
||||
{
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
@ -266,7 +258,6 @@ static inline void neo_set_no_input_flow_control(struct channel_t *ch)
|
||||
else
|
||||
efr &= ~(UART_17158_EFR_ECB | UART_17158_EFR_IXOFF);
|
||||
|
||||
|
||||
/* Why? Becuz Exar's spec says we have to zero it out before setting it */
|
||||
writeb(0, &ch->ch_neo_uart->efr);
|
||||
|
||||
@ -289,7 +280,6 @@ static inline void neo_set_no_input_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_set_no_output_flow_control(struct channel_t *ch)
|
||||
{
|
||||
unsigned char ier = readb(&ch->ch_neo_uart->ier);
|
||||
@ -327,7 +317,6 @@ static inline void neo_set_no_output_flow_control(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
/* change UARTs start/stop chars */
|
||||
static inline void neo_set_new_start_stop_chars(struct channel_t *ch)
|
||||
{
|
||||
@ -346,7 +335,6 @@ static inline void neo_set_new_start_stop_chars(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* No locks are assumed to be held when calling this function.
|
||||
*/
|
||||
@ -377,7 +365,6 @@ static inline void neo_clear_break(struct channel_t *ch, int force)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Parse the ISR register.
|
||||
*/
|
||||
@ -507,7 +494,6 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static inline void neo_parse_lsr(struct dgnc_board *brd, uint port)
|
||||
{
|
||||
struct channel_t *ch;
|
||||
@ -587,7 +573,6 @@ static inline void neo_parse_lsr(struct dgnc_board *brd, uint port)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* neo_param()
|
||||
* Send any/all changes to the line to the UART.
|
||||
@ -841,7 +826,6 @@ static void neo_param(struct tty_struct *tty)
|
||||
neo_parse_modem(ch, readb(&ch->ch_neo_uart->msr));
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Our board poller function.
|
||||
*/
|
||||
@ -920,7 +904,6 @@ static void neo_tasklet(unsigned long data)
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_neo_intr()
|
||||
*
|
||||
@ -1067,7 +1050,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)
|
||||
return IRQ_HANDLED;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Neo specific way of turning off the receiver.
|
||||
* Used as a way to enforce queue flow control when in
|
||||
@ -1082,7 +1064,6 @@ static void neo_disable_receiver(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Neo specific way of turning on the receiver.
|
||||
* Used as a way to un-enforce queue flow control when in
|
||||
@ -1097,7 +1078,6 @@ static void neo_enable_receiver(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
|
||||
{
|
||||
int qleft = 0;
|
||||
@ -1153,7 +1133,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
|
||||
total -= 3;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Finally, bound the copy to make sure we don't overflow
|
||||
* our own queue...
|
||||
@ -1306,7 +1285,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This function basically goes to sleep for secs, or until
|
||||
* it gets signalled that the port has fully drained.
|
||||
@ -1345,7 +1323,6 @@ static int neo_drain(struct tty_struct *tty, uint seconds)
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Flush the WRITE FIFO on the Neo.
|
||||
*
|
||||
@ -1375,7 +1352,6 @@ static void neo_flush_uart_write(struct channel_t *ch)
|
||||
ch->ch_flags |= (CH_TX_FIFO_EMPTY | CH_TX_FIFO_LWM);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Flush the READ FIFO on the Neo.
|
||||
*
|
||||
@ -1403,7 +1379,6 @@ static void neo_flush_uart_read(struct channel_t *ch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)
|
||||
{
|
||||
ushort head;
|
||||
@ -1551,7 +1526,6 @@ exit_unlock:
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void neo_parse_modem(struct channel_t *ch, unsigned char signals)
|
||||
{
|
||||
unsigned char msignals = signals;
|
||||
@ -1608,7 +1582,6 @@ static void neo_parse_modem(struct channel_t *ch, unsigned char signals)
|
||||
ch->ch_mistat &= ~UART_MSR_CTS;
|
||||
}
|
||||
|
||||
|
||||
/* Make the UART raise any of the output signals we want up */
|
||||
static void neo_assert_modem_signals(struct channel_t *ch)
|
||||
{
|
||||
@ -1629,7 +1602,6 @@ static void neo_assert_modem_signals(struct channel_t *ch)
|
||||
udelay(10);
|
||||
}
|
||||
|
||||
|
||||
static void neo_send_start_character(struct channel_t *ch)
|
||||
{
|
||||
if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
|
||||
@ -1643,7 +1615,6 @@ static void neo_send_start_character(struct channel_t *ch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static void neo_send_stop_character(struct channel_t *ch)
|
||||
{
|
||||
if (!ch || ch->magic != DGNC_CHANNEL_MAGIC)
|
||||
@ -1657,7 +1628,6 @@ static void neo_send_stop_character(struct channel_t *ch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* neo_uart_init
|
||||
*/
|
||||
@ -1668,7 +1638,6 @@ static void neo_uart_init(struct channel_t *ch)
|
||||
writeb(0, &ch->ch_neo_uart->efr);
|
||||
writeb(UART_EFR_ECB, &ch->ch_neo_uart->efr);
|
||||
|
||||
|
||||
/* Clear out UART and FIFO */
|
||||
readb(&ch->ch_neo_uart->txrx);
|
||||
writeb((UART_FCR_ENABLE_FIFO|UART_FCR_CLEAR_RCVR|UART_FCR_CLEAR_XMIT), &ch->ch_neo_uart->isr_fcr);
|
||||
@ -1682,7 +1651,6 @@ static void neo_uart_init(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Make the UART completely turn off.
|
||||
*/
|
||||
@ -1696,7 +1664,6 @@ static void neo_uart_off(struct channel_t *ch)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static uint neo_get_uart_bytes_left(struct channel_t *ch)
|
||||
{
|
||||
unsigned char left = 0;
|
||||
@ -1718,7 +1685,6 @@ static uint neo_get_uart_bytes_left(struct channel_t *ch)
|
||||
return left;
|
||||
}
|
||||
|
||||
|
||||
/* Channel lock MUST be held by the calling function! */
|
||||
static void neo_send_break(struct channel_t *ch, int msecs)
|
||||
{
|
||||
@ -1754,7 +1720,6 @@ static void neo_send_break(struct channel_t *ch, int msecs)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* neo_send_immediate_char.
|
||||
*
|
||||
@ -1772,7 +1737,6 @@ static void neo_send_immediate_char(struct channel_t *ch, unsigned char c)
|
||||
neo_pci_posting_flush(ch->ch_bd);
|
||||
}
|
||||
|
||||
|
||||
static unsigned int neo_read_eeprom(unsigned char __iomem *base, unsigned int address)
|
||||
{
|
||||
unsigned int enable;
|
||||
@ -1813,7 +1777,6 @@ static unsigned int neo_read_eeprom(unsigned char __iomem *base, unsigned int ad
|
||||
return val;
|
||||
}
|
||||
|
||||
|
||||
static void neo_vpd(struct dgnc_board *brd)
|
||||
{
|
||||
unsigned int i = 0;
|
||||
|
||||
@ -13,7 +13,6 @@
|
||||
* PURPOSE. See the GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/ctype.h>
|
||||
@ -26,28 +25,24 @@
|
||||
#include "dgnc_driver.h"
|
||||
#include "dgnc_mgmt.h"
|
||||
|
||||
|
||||
static ssize_t dgnc_driver_version_show(struct device_driver *ddp, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%s\n", DG_PART);
|
||||
}
|
||||
static DRIVER_ATTR(version, S_IRUSR, dgnc_driver_version_show, NULL);
|
||||
|
||||
|
||||
static ssize_t dgnc_driver_boards_show(struct device_driver *ddp, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%d\n", dgnc_NumBoards);
|
||||
}
|
||||
static DRIVER_ATTR(boards, S_IRUSR, dgnc_driver_boards_show, NULL);
|
||||
|
||||
|
||||
static ssize_t dgnc_driver_maxboards_show(struct device_driver *ddp, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%d\n", MAXBOARDS);
|
||||
}
|
||||
static DRIVER_ATTR(maxboards, S_IRUSR, dgnc_driver_maxboards_show, NULL);
|
||||
|
||||
|
||||
static ssize_t dgnc_driver_pollrate_show(struct device_driver *ddp, char *buf)
|
||||
{
|
||||
return snprintf(buf, PAGE_SIZE, "%dms\n", dgnc_poll_tick);
|
||||
@ -73,7 +68,6 @@ static ssize_t dgnc_driver_pollrate_store(struct device_driver *ddp,
|
||||
static DRIVER_ATTR(pollrate, (S_IRUSR | S_IWUSR), dgnc_driver_pollrate_show,
|
||||
dgnc_driver_pollrate_store);
|
||||
|
||||
|
||||
void dgnc_create_driver_sysfiles(struct pci_driver *dgnc_driver)
|
||||
{
|
||||
int rc = 0;
|
||||
@ -87,7 +81,6 @@ void dgnc_create_driver_sysfiles(struct pci_driver *dgnc_driver)
|
||||
pr_err("DGNC: sysfs driver_create_file failed!\n");
|
||||
}
|
||||
|
||||
|
||||
void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
|
||||
{
|
||||
struct device_driver *driverfs = &dgnc_driver->driver;
|
||||
@ -98,7 +91,6 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
|
||||
driver_remove_file(driverfs, &driver_attr_pollrate);
|
||||
}
|
||||
|
||||
|
||||
#define DGNC_VERIFY_BOARD(p, bd) \
|
||||
do { \
|
||||
if (!p) \
|
||||
@ -111,8 +103,6 @@ void dgnc_remove_driver_sysfiles(struct pci_driver *dgnc_driver)
|
||||
return 0; \
|
||||
} while (0)
|
||||
|
||||
|
||||
|
||||
static ssize_t dgnc_vpd_show(struct device *p, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
@ -152,7 +142,6 @@ static ssize_t dgnc_serial_number_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -171,7 +160,6 @@ static ssize_t dgnc_ports_state_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -190,7 +178,6 @@ static ssize_t dgnc_ports_baud_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
@ -221,7 +208,6 @@ static ssize_t dgnc_ports_msignals_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -240,7 +226,6 @@ static ssize_t dgnc_ports_iflag_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -259,7 +244,6 @@ static ssize_t dgnc_ports_cflag_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -278,7 +262,6 @@ static ssize_t dgnc_ports_oflag_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -297,7 +280,6 @@ static ssize_t dgnc_ports_lflag_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
@ -317,7 +299,6 @@ static ssize_t dgnc_ports_digi_flag_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -336,7 +317,6 @@ static ssize_t dgnc_ports_rxcount_show(struct device *p,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -355,7 +335,6 @@ static ssize_t dgnc_ports_txcount_show(struct device *p,
|
||||
}
|
||||
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
|
||||
*/
|
||||
@ -380,7 +359,6 @@ void dgnc_create_ports_sysfiles(struct dgnc_board *bd)
|
||||
dev_err(&bd->pdev->dev, "dgnc: sysfs device_create_file failed!\n");
|
||||
}
|
||||
|
||||
|
||||
/* removes all the sys files created for that port */
|
||||
void dgnc_remove_ports_sysfiles(struct dgnc_board *bd)
|
||||
{
|
||||
@ -398,7 +376,6 @@ void dgnc_remove_ports_sysfiles(struct dgnc_board *bd)
|
||||
device_remove_file(&(bd->pdev->dev), &dev_attr_serial_number);
|
||||
}
|
||||
|
||||
|
||||
static ssize_t dgnc_tty_state_show(struct device *d,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
@ -425,7 +402,6 @@ static ssize_t dgnc_tty_state_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -451,7 +427,6 @@ static ssize_t dgnc_tty_baud_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -486,7 +461,6 @@ static ssize_t dgnc_tty_msignals_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -512,7 +486,6 @@ static ssize_t dgnc_tty_iflag_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -538,7 +511,6 @@ static ssize_t dgnc_tty_cflag_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -564,7 +536,6 @@ static ssize_t dgnc_tty_oflag_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -590,7 +561,6 @@ static ssize_t dgnc_tty_lflag_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -616,7 +586,6 @@ static ssize_t dgnc_tty_digi_flag_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -642,7 +611,6 @@ static ssize_t dgnc_tty_rxcount_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -668,7 +636,6 @@ static ssize_t dgnc_tty_txcount_show(struct device *d,
|
||||
}
|
||||
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)
|
||||
{
|
||||
@ -696,7 +663,6 @@ static ssize_t dgnc_tty_name_show(struct device *d,
|
||||
}
|
||||
static DEVICE_ATTR(custom_name, S_IRUSR, dgnc_tty_name_show, NULL);
|
||||
|
||||
|
||||
static struct attribute *dgnc_sysfs_tty_entries[] = {
|
||||
&dev_attr_state.attr,
|
||||
&dev_attr_baud.attr,
|
||||
@ -712,13 +678,11 @@ static struct attribute *dgnc_sysfs_tty_entries[] = {
|
||||
NULL
|
||||
};
|
||||
|
||||
|
||||
static struct attribute_group dgnc_tty_attribute_group = {
|
||||
.name = NULL,
|
||||
.attrs = dgnc_sysfs_tty_entries,
|
||||
};
|
||||
|
||||
|
||||
void dgnc_create_tty_sysfs(struct un_t *un, struct device *c)
|
||||
{
|
||||
int ret;
|
||||
@ -734,7 +698,6 @@ void dgnc_create_tty_sysfs(struct un_t *un, struct device *c)
|
||||
|
||||
}
|
||||
|
||||
|
||||
void dgnc_remove_tty_sysfs(struct device *c)
|
||||
{
|
||||
sysfs_remove_group(&c->kobj, &dgnc_tty_attribute_group);
|
||||
|
||||
@ -63,7 +63,6 @@ static struct digi_t dgnc_digi_init = {
|
||||
.digi_term = "ansi" /* default terminal type */
|
||||
};
|
||||
|
||||
|
||||
/*
|
||||
* Define a local default termios struct. All ports will be created
|
||||
* with this termios initially.
|
||||
@ -80,7 +79,6 @@ static struct ktermios DgncDefaultTermios = {
|
||||
.c_line = 0,
|
||||
};
|
||||
|
||||
|
||||
/* Our function prototypes */
|
||||
static int dgnc_tty_open(struct tty_struct *tty, struct file *file);
|
||||
static void dgnc_tty_close(struct tty_struct *tty, struct file *file);
|
||||
@ -117,7 +115,6 @@ static void dgnc_tty_set_termios(struct tty_struct *tty,
|
||||
struct ktermios *old_termios);
|
||||
static void dgnc_tty_send_xchar(struct tty_struct *tty, char ch);
|
||||
|
||||
|
||||
static const struct tty_operations dgnc_tty_ops = {
|
||||
.open = dgnc_tty_open,
|
||||
.close = dgnc_tty_close,
|
||||
@ -172,7 +169,6 @@ int dgnc_tty_preinit(void)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_register()
|
||||
*
|
||||
@ -296,7 +292,6 @@ int dgnc_tty_register(struct dgnc_board *brd)
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_init()
|
||||
*
|
||||
@ -392,7 +387,6 @@ err_free_channels:
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_post_uninit()
|
||||
*
|
||||
@ -404,7 +398,6 @@ void dgnc_tty_post_uninit(void)
|
||||
dgnc_TmpWriteBuf = NULL;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_uninit()
|
||||
*
|
||||
@ -497,9 +490,6 @@ static void dgnc_wmove(struct channel_t *ch, char *buf, uint n)
|
||||
ch->ch_w_head = head;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*=======================================================================
|
||||
*
|
||||
* dgnc_input - Process received data.
|
||||
@ -685,7 +675,6 @@ exit_unlock:
|
||||
tty_ldisc_deref(ld);
|
||||
}
|
||||
|
||||
|
||||
/************************************************************************
|
||||
* Determines when CARRIER changes state and takes appropriate
|
||||
* action.
|
||||
@ -852,7 +841,6 @@ static void dgnc_set_custom_speed(struct channel_t *ch, uint newrate)
|
||||
ch->ch_custom_speed = newrate;
|
||||
}
|
||||
|
||||
|
||||
void dgnc_check_queue_flow_control(struct channel_t *ch)
|
||||
{
|
||||
int qleft = 0;
|
||||
@ -927,7 +915,6 @@ void dgnc_check_queue_flow_control(struct channel_t *ch)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void dgnc_wakeup_writes(struct channel_t *ch)
|
||||
{
|
||||
int qlen = 0;
|
||||
@ -1018,8 +1005,6 @@ void dgnc_wakeup_writes(struct channel_t *ch)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/************************************************************************
|
||||
*
|
||||
* TTY Entry points and helper functions
|
||||
@ -1126,11 +1111,9 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
|
||||
|
||||
spin_lock_irqsave(&ch->ch_lock, flags);
|
||||
|
||||
|
||||
/* Store our unit into driver_data, so we always have it available. */
|
||||
tty->driver_data = un;
|
||||
|
||||
|
||||
/*
|
||||
* Initialize tty's
|
||||
*/
|
||||
@ -1141,7 +1124,6 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
|
||||
/* Maybe do something here to the TTY struct as well? */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Allocate channel buffers for read/write/error.
|
||||
* Set flag, so we don't get trounced on.
|
||||
@ -1231,7 +1213,6 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)
|
||||
return rc;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_block_til_ready()
|
||||
*
|
||||
@ -1369,7 +1350,6 @@ static int dgnc_block_til_ready(struct tty_struct *tty,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_hangup()
|
||||
*
|
||||
@ -1391,7 +1371,6 @@ static void dgnc_tty_hangup(struct tty_struct *tty)
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_close()
|
||||
*
|
||||
@ -1457,7 +1436,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
|
||||
|
||||
tty->closing = 1;
|
||||
|
||||
|
||||
/*
|
||||
* Only officially close channel if count is 0 and
|
||||
* DIGI_PRINTER bit is not set.
|
||||
@ -1534,7 +1512,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_chars_in_buffer()
|
||||
*
|
||||
@ -1584,7 +1561,6 @@ static int dgnc_tty_chars_in_buffer(struct tty_struct *tty)
|
||||
return chars;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_maxcps_room
|
||||
*
|
||||
@ -1642,7 +1618,6 @@ static int dgnc_maxcps_room(struct tty_struct *tty, int bytes_available)
|
||||
return bytes_available;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_write_room()
|
||||
*
|
||||
@ -1703,7 +1678,6 @@ static int dgnc_tty_write_room(struct tty_struct *tty)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_put_char()
|
||||
*
|
||||
@ -1720,7 +1694,6 @@ static int dgnc_tty_put_char(struct tty_struct *tty, unsigned char c)
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_write()
|
||||
*
|
||||
@ -1864,7 +1837,6 @@ exit_retry:
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Return modem signals to ld.
|
||||
*/
|
||||
@ -1912,7 +1884,6 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty)
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_tiocmset()
|
||||
*
|
||||
@ -1964,7 +1935,6 @@ static int dgnc_tty_tiocmset(struct tty_struct *tty,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_send_break()
|
||||
*
|
||||
@ -2014,7 +1984,6 @@ static int dgnc_tty_send_break(struct tty_struct *tty, int msec)
|
||||
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_wait_until_sent()
|
||||
*
|
||||
@ -2044,7 +2013,6 @@ static void dgnc_tty_wait_until_sent(struct tty_struct *tty, int timeout)
|
||||
bd->bd_ops->drain(tty, 0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_send_xchar()
|
||||
*
|
||||
@ -2081,9 +2049,6 @@ static void dgnc_tty_send_xchar(struct tty_struct *tty, char c)
|
||||
dev_dbg(tty->dev, "dgnc_tty_send_xchar finish\n");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Return modem signals to ld.
|
||||
*/
|
||||
@ -2120,8 +2085,6 @@ static inline int dgnc_get_mstat(struct channel_t *ch)
|
||||
return result;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Return modem signals to ld.
|
||||
*/
|
||||
@ -2141,7 +2104,6 @@ static int dgnc_get_modem_info(struct channel_t *ch,
|
||||
return put_user(result, value);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_set_modem_info()
|
||||
*
|
||||
@ -2223,7 +2185,6 @@ static int dgnc_set_modem_info(struct tty_struct *tty,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_digigeta()
|
||||
*
|
||||
@ -2266,7 +2227,6 @@ static int dgnc_tty_digigeta(struct tty_struct *tty,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_digiseta()
|
||||
*
|
||||
@ -2354,7 +2314,6 @@ static int dgnc_tty_digiseta(struct tty_struct *tty,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_set_termios()
|
||||
*/
|
||||
@ -2396,7 +2355,6 @@ static void dgnc_tty_set_termios(struct tty_struct *tty,
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void dgnc_tty_throttle(struct tty_struct *tty)
|
||||
{
|
||||
struct channel_t *ch;
|
||||
@ -2421,7 +2379,6 @@ static void dgnc_tty_throttle(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void dgnc_tty_unthrottle(struct tty_struct *tty)
|
||||
{
|
||||
struct channel_t *ch;
|
||||
@ -2446,7 +2403,6 @@ static void dgnc_tty_unthrottle(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void dgnc_tty_start(struct tty_struct *tty)
|
||||
{
|
||||
struct dgnc_board *bd;
|
||||
@ -2476,7 +2432,6 @@ static void dgnc_tty_start(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
static void dgnc_tty_stop(struct tty_struct *tty)
|
||||
{
|
||||
struct dgnc_board *bd;
|
||||
@ -2506,7 +2461,6 @@ static void dgnc_tty_stop(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_flush_chars()
|
||||
*
|
||||
@ -2549,8 +2503,6 @@ static void dgnc_tty_flush_chars(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* dgnc_tty_flush_buffer()
|
||||
*
|
||||
@ -2595,8 +2547,6 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)
|
||||
spin_unlock_irqrestore(&ch->ch_lock, flags);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
*
|
||||
* The IOCTL function and all of its helpers
|
||||
@ -2672,7 +2622,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
|
||||
|
||||
return 0;
|
||||
|
||||
|
||||
case TCSBRKP:
|
||||
/* support for POSIX tcsendbreak()
|
||||
* According to POSIX.1 spec (7.2.2.1.2) breaks should be
|
||||
|
||||
Loading…
Reference in New Issue
Block a user