staging: dgnc: checkpatch cleanups
cover staging: dgnc: checkpatch cleanups
Resending after rebasing on current staging-testing tree. Few patches of the original series are already applied only these checkpatch related patches did not apply due to other changes.
regards
sudip
Sudip Mukherjee (6):
staging: dgnc: remove multiple blank lines
staging: dgnc: remove blankline before brace
staging: dgnc: remove blankline after brace
staging: dgnc: remove space after cast
staging: dgnc: alignment style
staging: dgnc: remove parenthesis
drivers/staging/dgnc/dgnc_cls.c | 31 ++++------ drivers/staging/dgnc/dgnc_driver.c | 23 ++------ drivers/staging/dgnc/dgnc_mgmt.c | 13 +--- drivers/staging/dgnc/dgnc_neo.c | 65 +++----------------- drivers/staging/dgnc/dgnc_sysfs.c | 86 ++++++++------------------- drivers/staging/dgnc/dgnc_tty.c | 118 ++++++++----------------------------- 6 files changed, 75 insertions(+), 261 deletions(-)
Signature · 1 line
1.9.1
PATCH RESEND 1/6 staging: dgnc: remove multiple blank lines
checkpatch warns us about multiple blank lines which are not needed. Remove them.
--- drivers/staging/dgnc/dgnc_driver.c | 10 -------- drivers/staging/dgnc/dgnc_mgmt.c | 5 ---- drivers/staging/dgnc/dgnc_neo.c | 37 --------------------------- drivers/staging/dgnc/dgnc_sysfs.c | 37 --------------------------- drivers/staging/dgnc/dgnc_tty.c | 51 -------------------------------------- 5 files changed, 140 deletions(-)
drivers/staging/dgnc/dgnc_driver.c +0 -10
@@ -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:
drivers/staging/dgnc/dgnc_mgmt.c +0 -5
@@ -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 ;
drivers/staging/dgnc/dgnc_neo.c +0 -37
@@ -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 adreturn val; } -static void neo_vpd (struct dgnc_board *brd) {unsigned int i =0 ;
drivers/staging/dgnc/dgnc_sysfs.c +0 -37
@@ -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);
drivers/staging/dgnc/dgnc_tty.c +0 -51
306 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH RESEND 2/6 staging: dgnc: remove blankline before brace
In reply to Sudip MukherjeeBlank lines are not needed before closing braces. checkpatch was giving warning about this.
--- drivers/staging/dgnc/dgnc_cls.c | 7 ------- drivers/staging/dgnc/dgnc_driver.c | 2 -- drivers/staging/dgnc/dgnc_mgmt.c | 1 - drivers/staging/dgnc/dgnc_neo.c | 1 - drivers/staging/dgnc/dgnc_sysfs.c | 1 - drivers/staging/dgnc/dgnc_tty.c | 4 ---- 6 files changed, 16 deletions(-)
drivers/staging/dgnc/dgnc_cls.c +0 -7
@@ -115,7 +115,6 @@ static inline void cls_set_cts_flow_control(struct channel_t *ch) &ch->ch_cls_uart->isr_fcr); ch->ch_t_tlevel =16 ; - }static inline void cls_set_ixon_flow_control (struct channel_t *ch)
@@ -161,7 +160,6 @@ static inline void cls_set_ixon_flow_control(struct channel_t *ch)writeb ((UART_FCR_ENABLE_FIFO |UART_16654_FCR_RXTRIGGER_16 |UART_16654_FCR_TXTRIGGER_16 |UART_FCR_CLEAR_RCVR ), &ch->ch_cls_uart->isr_fcr); - }static inline void cls_set_no_output_flow_control (struct channel_t *ch)
@@ -205,7 +203,6 @@ static inline void cls_set_no_output_flow_control(struct channel_t *ch) ch->ch_r_watermark =0 ; ch->ch_t_tlevel =16 ; ch->ch_r_tlevel =16 ; - }static inline void cls_set_rts_flow_control (struct channel_t *ch)
@@ -244,7 +241,6 @@ static inline void cls_set_rts_flow_control(struct channel_t *ch) ch->ch_r_watermark =4 ; ch->ch_r_tlevel =8 ; - }static inline void cls_set_ixoff_flow_control (struct channel_t *ch)
@@ -286,7 +282,6 @@ static inline void cls_set_ixoff_flow_control(struct channel_t *ch)writeb ((UART_FCR_ENABLE_FIFO |UART_16654_FCR_RXTRIGGER_16 |UART_16654_FCR_TXTRIGGER_16 |UART_FCR_CLEAR_RCVR ), &ch->ch_cls_uart->isr_fcr); - }static inline void cls_set_no_input_flow_control (struct channel_t *ch)
@@ -325,7 +320,6 @@ static inline void cls_set_no_input_flow_control(struct channel_t *ch) ch->ch_t_tlevel =16 ; ch->ch_r_tlevel =16 ; - }/*
@@ -746,7 +740,6 @@ static void cls_tasklet(unsigned long data) }spin_unlock_irqrestore (&bd->bd_intr_lock, flags); - }/*
drivers/staging/dgnc/dgnc_driver.c +0 -2
@@ -529,7 +529,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)dev_err (&brd->pdev->dev,"Didn't find any compatible Neo/Classic PCI boards.\n" );return -ENXIO ; - }/*
@@ -581,7 +580,6 @@ failed: brd->dpastatus =BD_NOFEP ;return -ENXIO ; - }static int dgnc_finalize_board_init (struct dgnc_board *brd)
drivers/staging/dgnc/dgnc_mgmt.c +0 -1
@@ -251,7 +251,6 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)break ; } - }return 0 ;
drivers/staging/dgnc/dgnc_neo.c +0 -1
@@ -901,7 +901,6 @@ static void neo_tasklet(unsigned long data)/* Allow interrupt routine to access the interrupt register again */ spin_unlock_irqrestore (&bd->bd_intr_lock, flags); - }/*
drivers/staging/dgnc/dgnc_sysfs.c +0 -1
@@ -695,7 +695,6 @@ void dgnc_create_tty_sysfs(struct un_t *un, struct device *c) }dev_set_drvdata (c, un); - }void dgnc_remove_tty_sysfs (struct device *c)
drivers/staging/dgnc/dgnc_tty.c +0 -4
@@ -374,7 +374,6 @@ int dgnc_tty_init(struct dgnc_board *brd) ch->ch_pun.un_sysfs = classp;dgnc_create_tty_sysfs (&ch->ch_pun, classp); } - }return 0 ;
@@ -1368,7 +1367,6 @@ static void dgnc_tty_hangup(struct tty_struct *tty)/* flush the transmit queues */ dgnc_tty_flush_buffer (tty); - }/*
@@ -1981,7 +1979,6 @@ static int dgnc_tty_send_break(struct tty_struct *tty, int msec)spin_unlock_irqrestore (&ch->ch_lock, flags);return 0 ; - }/*
@@ -2744,7 +2741,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, ~(UN_LOW |UN_EMPTY );wake_up_interruptible (&ch->ch_pun.un_flags_wait); } - } }
Signature · 1 line
1.9.1
PATCH RESEND 3/6 staging: dgnc: remove blankline after brace
In reply to Sudip MukherjeeBlank lines are not needed after opening braces. checkpatch was giving us warnings about this.
--- drivers/staging/dgnc/dgnc_cls.c | 4 ---- drivers/staging/dgnc/dgnc_driver.c | 3 --- drivers/staging/dgnc/dgnc_mgmt.c | 1 - drivers/staging/dgnc/dgnc_neo.c | 11 ----------- drivers/staging/dgnc/dgnc_tty.c | 11 ----------- 5 files changed, 30 deletions(-)
drivers/staging/dgnc/dgnc_cls.c +0 -4
@@ -378,7 +378,6 @@ static inline void cls_parse_isr(struct dgnc_board *brd, uint port)/* Here we try to figure out what caused the interrupt to happen */ while (1 ) { - isr =readb (&ch->ch_cls_uart->isr_fcr);/* Bail if no pending interrupt on port */
@@ -472,7 +471,6 @@ static void cls_param(struct tty_struct *tty) ch->ch_old_baud =0 ;return ; }else if (ch->ch_custom_speed) { - baud = ch->ch_custom_speed;/* Handle transition from B0 */ if (ch->ch_flags &CH_BAUD0 ) {
@@ -704,7 +702,6 @@ static void cls_tasklet(unsigned long data)* If board is ready, parse deeper to see if there is anything to do. */ if ((state ==BOARD_READY ) && (ports >0 )) { -/* Loop on each port */ for (i =0 ; i < ports; i++) { ch = bd->channels[i];
@@ -999,7 +996,6 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch) n =min (n, qlen);while (n >0 ) { -/* * If RTS Toggle mode is on, turn on RTS now if not already set, * and make sure we get an event when the data transfer has
drivers/staging/dgnc/dgnc_driver.c +0 -3
@@ -417,7 +417,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) brd->irq = pci_irq;switch (brd->device) { -case PCI_DEVICE_CLASSIC_4_DID :case PCI_DEVICE_CLASSIC_8_DID :case PCI_DEVICE_CLASSIC_4_422_DID :
@@ -516,7 +515,6 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)dgnc_do_remap (brd);if (brd->re_map_membase) { -/* Read and store the dvid after remapping */ brd->dvid =readb (brd->re_map_membase +0x8D );
@@ -609,7 +607,6 @@ static int dgnc_finalize_board_init(struct dgnc_board *brd)*/ static void dgnc_do_remap (struct dgnc_board *brd) { -if (!brd || brd->magic !=DGNC_BOARD_MAGIC )return ;
drivers/staging/dgnc/dgnc_mgmt.c +0 -1
@@ -99,7 +99,6 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg)void __user *uarg = (void __user *) arg;switch (cmd) { -case DIGI_GETDD : {/*
drivers/staging/dgnc/dgnc_neo.c +0 -11
@@ -320,7 +320,6 @@ static inline void neo_set_no_output_flow_control(struct channel_t *ch)/* change UARTs start/stop chars */ static inline void neo_set_new_start_stop_chars (struct channel_t *ch) { -/* if hardware flow control is set, then skip this whole thing */ if (ch->ch_digi.digi_flags & (CTSPACE |RTSPACE ) || ch->ch_c_cflag &CRTSCTS )return ;
@@ -387,7 +386,6 @@ static inline void neo_parse_isr(struct dgnc_board *brd, uint port)/* Here we try to figure out what caused the interrupt to happen */ while (1 ) { - isr =readb (&ch->ch_neo_uart->isr_fcr);/* Bail if no pending interrupt */
@@ -626,7 +624,6 @@ static void neo_param(struct tty_struct *tty)return ; }else if (ch->ch_custom_speed) { - baud = ch->ch_custom_speed;/* Handle transition from B0 */ if (ch->ch_flags &CH_BAUD0 ) {
@@ -954,7 +951,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)/* Loop on each port */ while ((uart_poll &0xff ) !=0 ) { - tmp = uart_poll;/* Check current port to see if it has interrupt pending */
@@ -977,7 +973,6 @@ static irqreturn_t neo_intr(int irq, void *voidbrd)/* Switch on type of interrupt we have */ switch (type) { -case UART_17158_RXRDY_TIMEOUT :/* * RXRDY Time-out is cleared by reading data in the
@@ -1141,7 +1136,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch) total =min (total, qleft);while (total >0 ) { -/* * Grab the linestatus register, we need to check * to see if there are any errors in the FIFO.
@@ -1206,7 +1200,6 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)* Also deal with any possible queue overflow here as well. */ while (1 ) { -/* * Its possible we have a linestatus from the loop above * this, so we "OR" on any extra bits.
@@ -1339,7 +1332,6 @@ static void neo_flush_uart_write(struct channel_t *ch)neo_pci_posting_flush (ch->ch_bd);for (i =0 ; i <10 ; i++) { -/* Check to see if the UART feels it completely flushed the FIFO. */ tmp =readb (&ch->ch_neo_uart->isr_fcr);if (tmp &4 )
@@ -1368,7 +1360,6 @@ static void neo_flush_uart_read(struct channel_t *ch)neo_pci_posting_flush (ch->ch_bd);for (i =0 ; i <10 ; i++) { -/* Check to see if the UART feels it completely flushed the FIFO. */ tmp =readb (&ch->ch_neo_uart->isr_fcr);if (tmp &2 )
@@ -1473,7 +1464,6 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch) n =min (n, qlen);while (n >0 ) { - s = ((head >= tail) ? head :WQUEUESIZE ) - tail; s =min (s, n);
@@ -1632,7 +1622,6 @@ static void neo_send_stop_character(struct channel_t *ch)*/ static void neo_uart_init (struct channel_t *ch) { -writeb (0 , &ch->ch_neo_uart->ier);writeb (0 , &ch->ch_neo_uart->efr);writeb (UART_EFR_ECB , &ch->ch_neo_uart->efr);
drivers/staging/dgnc/dgnc_tty.c +0 -11
@@ -543,7 +543,6 @@ void dgnc_input(struct channel_t *ch) !(ch->ch_tun.un_flags & UN_ISOPEN) || !(tp->termios.c_cflag & CREAD) || (ch->ch_tun.un_flags & UN_CLOSING)) { - ch->ch_r_head = tail;/* Force queue flow control to be released, if needed */
@@ -706,7 +705,6 @@ void dgnc_carrier(struct channel_t *ch)* Test for a VIRTUAL carrier transition to HIGH. */ if (((ch->ch_flags &CH_FCAR ) ==0 ) && (virt_carrier ==1 )) { -/* * When carrier rises, wake any threads waiting * for carrier in the open routine.
@@ -720,7 +718,6 @@ void dgnc_carrier(struct channel_t *ch)* Test for a PHYSICAL carrier transition to HIGH. */ if (((ch->ch_flags &CH_CD ) ==0 ) && (phys_carrier ==1 )) { -/* * When carrier rises, wake any threads waiting * for carrier in the open routine.
@@ -741,7 +738,6 @@ void dgnc_carrier(struct channel_t *ch)*/ if ((virt_carrier ==0 ) && ((ch->ch_flags &CH_CD ) !=0 ) && (phys_carrier ==0 )) { -/* * When carrier drops: *
@@ -1148,7 +1144,6 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)* Initialize if neither terminal or printer is open. */ if (!((ch->ch_tun.un_flags | ch->ch_pun.un_flags) &UN_ISOPEN )) { -/* * Flush input queues. */
@@ -1241,7 +1236,6 @@ static int dgnc_block_til_ready(struct tty_struct *tty,/* Loop forever */ while (1 ) { - sleep_on_un_flags =0 ;/*
@@ -1269,7 +1263,6 @@ static int dgnc_block_til_ready(struct tty_struct *tty,if (!((ch->ch_tun.un_flags | ch->ch_pun.un_flags) &UN_CLOSING )) { -/* * Our conditions to leave cleanly and happily: * 1) NONBLOCKING on the tty is set.
@@ -1440,7 +1433,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)*/ if ((ch->ch_open_count ==0 ) && !(ch->ch_digi.digi_flags &DIGI_PRINTER )) { - ch->ch_flags &= ~(CH_STOPI |CH_FORCED_STOPI );/*
@@ -1469,7 +1461,6 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)* If we have HUPCL set, lower DTR and RTS */ if (ch->ch_c_cflag &HUPCL ) { -/* Drop RTS/DTR */ ch->ch_mostat &= ~(UART_MCR_DTR |UART_MCR_RTS ); bd->bd_ops->assert_modem_signals (ch);
@@ -2588,7 +2579,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, }switch (cmd) { -/* Here are all the standard ioctl's that we MUST implement */ case TCSBRK :
@@ -2801,7 +2791,6 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,/* set information for ditty */ if (cmd == (DIGI_SETAW )) { -spin_unlock_irqrestore (&ch->ch_lock, flags); rc = ch->ch_bd->bd_ops->drain (tty,0 );
Signature · 1 line
1.9.1
PATCH RESEND 4/6 staging: dgnc: remove space after cast
In reply to Sudip MukherjeeSpace is not necessary after typecast.
--- drivers/staging/dgnc/dgnc_cls.c | 6 +++--- drivers/staging/dgnc/dgnc_driver.c | 6 +++--- drivers/staging/dgnc/dgnc_mgmt.c | 6 +++--- drivers/staging/dgnc/dgnc_neo.c | 12 ++++++------ drivers/staging/dgnc/dgnc_tty.c | 24 ++++++++++++------------ 5 files changed, 27 insertions(+), 27 deletions(-)
drivers/staging/dgnc/dgnc_cls.c +3 -3
@@ -438,7 +438,7 @@ static void cls_param(struct tty_struct *tty)if (!tty || tty->magic !=TTY_MAGIC )return ; - un = (struct un_t *) tty->driver_data; + un = (struct un_t *)tty->driver_data;if (!un || un->magic !=DGNC_UNIT_MAGIC )return ;
@@ -676,7 +676,7 @@ static void cls_param(struct tty_struct *tty)*/ static void cls_tasklet (unsigned long data) { -struct dgnc_board *bd = (struct dgnc_board *) data; +struct dgnc_board *bd = (struct dgnc_board *)data;struct channel_t *ch;unsigned long flags;int i;
@@ -904,7 +904,7 @@ static int cls_drain(struct tty_struct *tty, uint seconds)if (!tty || tty->magic !=TTY_MAGIC )return -ENXIO ; - un = (struct un_t *) tty->driver_data; + un = (struct un_t *)tty->driver_data;if (!un || un->magic !=DGNC_UNIT_MAGIC )return -ENXIO ;
drivers/staging/dgnc/dgnc_driver.c +3 -3
@@ -452,7 +452,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id) brd->iobase =pci_resource_start (pdev,1 ); brd->iobase_end =pci_resource_end (pdev,1 ); - brd->iobase = ((unsigned int ) (brd->iobase)) &0xFFFE ; + brd->iobase = ((unsigned int )(brd->iobase)) &0xFFFE ;/* Assign the board_ops struct */ brd->bd_ops = &dgnc_cls_ops;
@@ -559,7 +559,7 @@ static int dgnc_found_board(struct pci_dev *pdev, int id)/* init our poll helper tasklet */ tasklet_init (&brd->helper_tasklet, brd->bd_ops->tasklet, - (unsigned long ) brd); + (unsigned long )brd);spin_lock_irqsave (&dgnc_global_lock, flags); brd->msgbuf =NULL ;
@@ -672,7 +672,7 @@ static void dgnc_poll_handler(ulong dummy) new_time = dgnc_poll_time - jiffies; -if ((ulong ) new_time >=2 * dgnc_poll_tick) +if ((ulong )new_time >=2 * dgnc_poll_tick) dgnc_poll_time = jiffies +dgnc_jiffies_from_ms (dgnc_poll_tick);setup_timer (&dgnc_poll_timer, dgnc_poll_handler,0 );
drivers/staging/dgnc/dgnc_mgmt.c +3 -3
@@ -96,7 +96,7 @@ int dgnc_mgmt_close(struct inode *inode, struct file *file)long dgnc_mgmt_ioctl (struct file *file,unsigned int cmd,unsigned long arg) {unsigned long flags; -void __user *uarg = (void __user *) arg; +void __user *uarg = (void __user *)arg;switch (cmd) {case DIGI_GETDD :
@@ -142,8 +142,8 @@ long dgnc_mgmt_ioctl(struct file *file, unsigned int cmd, unsigned long arg) di.info_bdtype = dgnc_Board[brd]->dpatype; di.info_bdstate = dgnc_Board[brd]->dpastatus; di.info_ioport =0 ; - di.info_physaddr = (ulong ) dgnc_Board[brd]->membase; - di.info_physsize = (ulong ) dgnc_Board[brd]->membase + di.info_physaddr = (ulong )dgnc_Board[brd]->membase; + di.info_physsize = (ulong )dgnc_Board[brd]->membase - dgnc_Board[brd]->membase_end;if (dgnc_Board[brd]->state !=BOARD_FAILED ) di.info_nports = dgnc_Board[brd]->nasync;
drivers/staging/dgnc/dgnc_neo.c +6 -6
@@ -590,7 +590,7 @@ static void neo_param(struct tty_struct *tty)if (!tty || tty->magic !=TTY_MAGIC )return ; - un = (struct un_t *) tty->driver_data; + un = (struct un_t *)tty->driver_data;if (!un || un->magic !=DGNC_UNIT_MAGIC )return ;
@@ -828,7 +828,7 @@ static void neo_param(struct tty_struct *tty)*/ static void neo_tasklet (unsigned long data) { -struct dgnc_board *bd = (struct dgnc_board *) data; +struct dgnc_board *bd = (struct dgnc_board *)data;struct channel_t *ch;unsigned long flags;int i;
@@ -1151,7 +1151,7 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch)break ;/* Make sure we don't go over the end of our queue */ - n =min (((uint ) total), (RQUEUESIZE - (uint ) head)); + n =min (((uint )total), (RQUEUESIZE - (uint )head));/* * Cut down n even further if needed, this is to fix
@@ -1256,7 +1256,7 @@ static void neo_copy_data_from_uart_to_queue(struct channel_t *ch) }memcpy_fromio (ch->ch_rqueue + head, &ch->ch_neo_uart->txrxburst,1 ); - ch->ch_equeue[head] = (unsigned char ) linestatus; + ch->ch_equeue[head] = (unsigned char )linestatus;/* Ditch any remaining linestatus value. */ linestatus =0 ;
@@ -1291,7 +1291,7 @@ static int neo_drain(struct tty_struct *tty, uint seconds)if (!tty || tty->magic !=TTY_MAGIC )return -ENXIO ; - un = (struct un_t *) tty->driver_data; + un = (struct un_t *)tty->driver_data;if (!un || un->magic !=DGNC_UNIT_MAGIC )return -ENXIO ;
@@ -1447,7 +1447,7 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch) n =readb (&ch->ch_neo_uart->tfifo); -if ((unsigned int ) n > ch->ch_t_tlevel) +if ((unsigned int )n > ch->ch_t_tlevel) goto exit_unlock; n =UART_17158_TX_FIFOSIZE - ch->ch_t_tlevel;
drivers/staging/dgnc/dgnc_tty.c +12 -12
@@ -1440,7 +1440,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)*/ if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int ) ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); ch->ch_flags &= ~CH_PRON ; }
@@ -1487,7 +1487,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)*/ if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int ) ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); ch->ch_flags &= ~CH_PRON ; } }
@@ -1756,7 +1756,7 @@ static int dgnc_tty_write(struct tty_struct *tty,*/ if ((un->un_type ==DGNC_PRINT ) && !(ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_onstr, - (int ) ch->ch_digi.digi_onlen); + (int )ch->ch_digi.digi_onlen); head = (ch->ch_w_head) & tmask; ch->ch_flags |=CH_PRON ; }
@@ -1767,7 +1767,7 @@ static int dgnc_tty_write(struct tty_struct *tty,*/ if ((un->un_type !=DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int ) ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); head = (ch->ch_w_head) & tmask; ch->ch_flags &= ~CH_PRON ; }
@@ -2554,7 +2554,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,struct un_t *un;int rc;unsigned long flags; -void __user *uarg = (void __user *) arg; +void __user *uarg = (void __user *)arg;if (!tty || tty->magic !=TTY_MAGIC )return -ENODEV ;
@@ -2660,13 +2660,13 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,spin_unlock_irqrestore (&ch->ch_lock, flags); rc =put_user (C_CLOCAL (tty) ?1 :0 , - (unsigned long __user *) arg); + (unsigned long __user *)arg);return rc;case TIOCSSOFTCAR :spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =get_user (arg, (unsigned long __user *) arg); + rc =get_user (arg, (unsigned long __user *)arg);if (rc)return rc;
@@ -2814,7 +2814,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,* could sleep */ spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =get_user (loopback, (unsigned int __user *) arg); + rc =get_user (loopback, (unsigned int __user *)arg);if (rc)return rc;spin_lock_irqsave (&ch->ch_lock, flags);
@@ -2832,7 +2832,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,case DIGI_GETCUSTOMBAUD :spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =put_user (ch->ch_custom_speed, (unsigned int __user *) arg); + rc =put_user (ch->ch_custom_speed, (unsigned int __user *)arg);return rc;case DIGI_SETCUSTOMBAUD :
@@ -2840,7 +2840,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,int new_rate;/* Let go of locks when accessing user space, could sleep */ spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =get_user (new_rate, (int __user *) arg); + rc =get_user (new_rate, (int __user *)arg);if (rc)return rc;spin_lock_irqsave (&ch->ch_lock, flags);
@@ -2862,7 +2862,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd,unsigned char c;spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =get_user (c, (unsigned char __user *) arg); + rc =get_user (c, (unsigned char __user *)arg);if (rc)return rc;spin_lock_irqsave (&ch->ch_lock, flags);
@@ -2919,7 +2919,7 @@ static int dgnc_tty_ioctl(struct tty_struct *tty, unsigned int cmd, events |= (EV_IPU |EV_IPS );spin_unlock_irqrestore (&ch->ch_lock, flags); - rc =put_user (events, (unsigned int __user *) arg); + rc =put_user (events, (unsigned int __user *)arg);return rc; }
Signature · 1 line
1.9.1
PATCH RESEND 5/6 staging: dgnc: alignment style
In reply to Sudip Mukherjeecheckpatch was warning us that the alignment should match the open parenthesis.
--- drivers/staging/dgnc/dgnc_cls.c | 14 +++++++------- drivers/staging/dgnc/dgnc_driver.c | 2 +- drivers/staging/dgnc/dgnc_neo.c | 2 +- drivers/staging/dgnc/dgnc_tty.c | 26 +++++++++++++------------- 4 files changed, 22 insertions(+), 22 deletions(-)
drivers/staging/dgnc/dgnc_cls.c +7 -7
@@ -518,7 +518,7 @@ static void cls_param(struct tty_struct *tty)* unit is NOT open */ if (!(ch->ch_tun.un_flags &UN_ISOPEN ) && - (un->un_type ==DGNC_PRINT )) + (un->un_type ==DGNC_PRINT )) baud =C_BAUD (ch->ch_pun.un_tty) &0xff ;else baud =C_BAUD (ch->ch_tun.un_tty) &0xff ;
@@ -532,7 +532,7 @@ static void cls_param(struct tty_struct *tty) jindex = baud;if ((iindex >=0 ) && (iindex <4 ) && (jindex >=0 ) && - (jindex <16 )) { + (jindex <16 )) { baud = bauds[iindex][jindex]; }else { baud =0 ;
@@ -641,7 +641,7 @@ static void cls_param(struct tty_struct *tty)* disable flow control */ if ((ch->ch_startc == _POSIX_VDISABLE) || - (ch->ch_stopc == _POSIX_VDISABLE)) + (ch->ch_stopc == _POSIX_VDISABLE))cls_set_no_output_flow_control (ch);else cls_set_ixon_flow_control (ch);
@@ -657,7 +657,7 @@ static void cls_param(struct tty_struct *tty)* flow control */ if ((ch->ch_startc == _POSIX_VDISABLE) || - (ch->ch_stopc == _POSIX_VDISABLE)) + (ch->ch_stopc == _POSIX_VDISABLE))cls_set_no_input_flow_control (ch);else cls_set_ixoff_flow_control (ch);
@@ -933,7 +933,7 @@ static void cls_flush_uart_write(struct channel_t *ch)return ;writeb ((UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_XMIT ), - &ch->ch_cls_uart->isr_fcr); + &ch->ch_cls_uart->isr_fcr);udelay (10 ); ch->ch_flags |= (CH_TX_FIFO_EMPTY |CH_TX_FIFO_LWM );
@@ -979,7 +979,7 @@ static void cls_copy_data_from_queue_to_uart(struct channel_t *ch)/* If port is "stopped", don't send any data to the UART */ if ((ch->ch_flags &CH_FORCED_STOP ) || - (ch->ch_flags &CH_BREAK_SENDING )) + (ch->ch_flags &CH_BREAK_SENDING )) goto exit_unlock;if (!(ch->ch_flags & (CH_TX_FIFO_EMPTY |CH_TX_FIFO_LWM )))
@@ -1169,7 +1169,7 @@ static void cls_uart_init(struct channel_t *ch)readb (&ch->ch_cls_uart->txrx);writeb ((UART_FCR_ENABLE_FIFO |UART_FCR_CLEAR_RCVR |UART_FCR_CLEAR_XMIT ), - &ch->ch_cls_uart->isr_fcr); + &ch->ch_cls_uart->isr_fcr);udelay (10 ); ch->ch_flags |= (CH_FIFO_ENABLED |CH_TX_FIFO_EMPTY |CH_TX_FIFO_LWM );
drivers/staging/dgnc/dgnc_driver.c +1 -1
@@ -237,7 +237,7 @@ static int dgnc_start(void) } dev =device_create (dgnc_class,NULL , -MKDEV (dgnc_Major,0 ), +MKDEV (dgnc_Major,0 ),NULL ,"dgnc_mgmt" );if (IS_ERR (dev)) { rc =PTR_ERR (dev);
drivers/staging/dgnc/dgnc_neo.c +1 -1
@@ -1390,7 +1390,7 @@ static void neo_copy_data_from_queue_to_uart(struct channel_t *ch)/* If port is "stopped", don't send any data to the UART */ if ((ch->ch_flags &CH_FORCED_STOP ) || - (ch->ch_flags &CH_BREAK_SENDING )) + (ch->ch_flags &CH_BREAK_SENDING )) goto exit_unlock;/*
drivers/staging/dgnc/dgnc_tty.c +13 -13
@@ -365,12 +365,12 @@ int dgnc_tty_init(struct dgnc_board *brd)struct device *classp; classp =tty_register_device (&brd->SerialDriver, i, - &(ch->ch_bd->pdev->dev)); + &(ch->ch_bd->pdev->dev)); ch->ch_tun.un_sysfs = classp;dgnc_create_tty_sysfs (&ch->ch_tun, classp); classp =tty_register_device (&brd->PrintDriver, i, - &(ch->ch_bd->pdev->dev)); + &(ch->ch_bd->pdev->dev)); ch->ch_pun.un_sysfs = classp;dgnc_create_tty_sysfs (&ch->ch_pun, classp); }
@@ -934,7 +934,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)if (ch->ch_tun.un_flags &UN_ISOPEN ) {if ((ch->ch_tun.un_tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - ch->ch_tun.un_tty->ldisc->ops->write_wakeup) { + ch->ch_tun.un_tty->ldisc->ops->write_wakeup) {spin_unlock_irqrestore (&ch->ch_lock, flags); (ch->ch_tun.un_tty->ldisc->ops->write_wakeup)(ch->ch_tun.un_tty);spin_lock_irqsave (&ch->ch_lock, flags);
@@ -948,7 +948,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)*/ if (ch->ch_tun.un_flags &UN_EMPTY ) {if ((qlen ==0 ) && - (ch->ch_bd->bd_ops->get_uart_bytes_left (ch) ==0 )) { + (ch->ch_bd->bd_ops->get_uart_bytes_left (ch) ==0 )) { ch->ch_tun.un_flags &= ~(UN_EMPTY );/*
@@ -976,7 +976,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)if (ch->ch_pun.un_flags &UN_ISOPEN ) {if ((ch->ch_pun.un_tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && - ch->ch_pun.un_tty->ldisc->ops->write_wakeup) { + ch->ch_pun.un_tty->ldisc->ops->write_wakeup) {spin_unlock_irqrestore (&ch->ch_lock, flags); (ch->ch_pun.un_tty->ldisc->ops->write_wakeup)(ch->ch_pun.un_tty);spin_lock_irqsave (&ch->ch_lock, flags);
@@ -1038,7 +1038,7 @@ static int dgnc_tty_open(struct tty_struct *tty, struct file *file)* sleep waiting for it to happen or they cancel the open. */ rc =wait_event_interruptible (brd->state_wait, - (brd->state &BOARD_READY )); + (brd->state &BOARD_READY ));if (rc)return rc;
@@ -1440,7 +1440,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)*/ if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int )ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); ch->ch_flags &= ~CH_PRON ; }
@@ -1487,7 +1487,7 @@ static void dgnc_tty_close(struct tty_struct *tty, struct file *file)*/ if ((un->un_type ==DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int )ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); ch->ch_flags &= ~CH_PRON ; } }
@@ -1690,7 +1690,7 @@ static int dgnc_tty_put_char(struct tty_struct *tty, unsigned char c)* In here exists all the Transparent Print magic as well. */ static int dgnc_tty_write (struct tty_struct *tty, -const unsigned char *buf,int count) +const unsigned char *buf,int count) {struct channel_t *ch =NULL ;struct un_t *un =NULL ;
@@ -1756,7 +1756,7 @@ static int dgnc_tty_write(struct tty_struct *tty,*/ if ((un->un_type ==DGNC_PRINT ) && !(ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_onstr, - (int )ch->ch_digi.digi_onlen); + (int )ch->ch_digi.digi_onlen); head = (ch->ch_w_head) & tmask; ch->ch_flags |=CH_PRON ; }
@@ -1767,7 +1767,7 @@ static int dgnc_tty_write(struct tty_struct *tty,*/ if ((un->un_type !=DGNC_PRINT ) && (ch->ch_flags &CH_PRON )) {dgnc_wmove (ch, ch->ch_digi.digi_offstr, - (int )ch->ch_digi.digi_offlen); + (int )ch->ch_digi.digi_offlen); head = (ch->ch_w_head) & tmask; ch->ch_flags &= ~CH_PRON ; }
@@ -1880,7 +1880,7 @@ static int dgnc_tty_tiocmget(struct tty_struct *tty)*/ static int dgnc_tty_tiocmset (struct tty_struct *tty, -unsigned int set,unsigned int clear) +unsigned int set,unsigned int clear) {struct dgnc_board *bd;struct channel_t *ch;
@@ -2547,7 +2547,7 @@ static void dgnc_tty_flush_buffer(struct tty_struct *tty)* The usual assortment of ioctl's */ static int dgnc_tty_ioctl (struct tty_struct *tty,unsigned int cmd, -unsigned long arg) +unsigned long arg) {struct dgnc_board *bd;struct channel_t *ch;
Signature · 1 line
1.9.1
PATCH RESEND 6/6 staging: dgnc: remove parenthesis
In reply to Sudip Mukherjeecheckpatch was warning us about extra unneeded parenthesis.
--- drivers/staging/dgnc/dgnc_neo.c | 2 +- drivers/staging/dgnc/dgnc_sysfs.c | 48 +++++++++++++++++++-------------------- drivers/staging/dgnc/dgnc_tty.c | 14 ++++++------ 3 files changed, 32 insertions(+), 32 deletions(-)
drivers/staging/dgnc/dgnc_neo.c +1 -1
@@ -1792,6 +1792,6 @@ static void neo_vpd(struct dgnc_board *brd)/* Search for the serial number */ for (i =0 ; i <NEO_VPD_IMAGEBYTES -3 ; i++)if (brd->vpd[i] =='S' && brd->vpd[i +1 ] =='N' ) -strncpy (brd->serial_num, &(brd->vpd[i +3 ]),9 ); +strncpy (brd->serial_num, &brd->vpd[i +3 ],9 ); } }
drivers/staging/dgnc/dgnc_sysfs.c +24 -24
60 lines not on this page · raw message
drivers/staging/dgnc/dgnc_tty.c +7 -7
@@ -365,12 +365,12 @@ int dgnc_tty_init(struct dgnc_board *brd)struct device *classp; classp =tty_register_device (&brd->SerialDriver, i, - &(ch->ch_bd->pdev->dev)); + &ch->ch_bd->pdev->dev); ch->ch_tun.un_sysfs = classp;dgnc_create_tty_sysfs (&ch->ch_tun, classp); classp =tty_register_device (&brd->PrintDriver, i, - &(ch->ch_bd->pdev->dev)); + &ch->ch_bd->pdev->dev); ch->ch_pun.un_sysfs = classp;dgnc_create_tty_sysfs (&ch->ch_pun, classp); }
@@ -710,7 +710,7 @@ void dgnc_carrier(struct channel_t *ch)* for carrier in the open routine. */ -if (waitqueue_active (&(ch->ch_flags_wait))) +if (waitqueue_active (&ch->ch_flags_wait))wake_up_interruptible (&ch->ch_flags_wait); }
@@ -723,7 +723,7 @@ void dgnc_carrier(struct channel_t *ch)* for carrier in the open routine. */ -if (waitqueue_active (&(ch->ch_flags_wait))) +if (waitqueue_active (&ch->ch_flags_wait))wake_up_interruptible (&ch->ch_flags_wait); }
@@ -750,7 +750,7 @@ void dgnc_carrier(struct channel_t *ch)* * Enable all select calls. */ -if (waitqueue_active (&(ch->ch_flags_wait))) +if (waitqueue_active (&ch->ch_flags_wait))wake_up_interruptible (&ch->ch_flags_wait);if (ch->ch_tun.un_open_count >0 )
@@ -936,7 +936,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)if ((ch->ch_tun.un_tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && ch->ch_tun.un_tty->ldisc->ops->write_wakeup) {spin_unlock_irqrestore (&ch->ch_lock, flags); - (ch->ch_tun.un_tty->ldisc->ops->write_wakeup)(ch->ch_tun.un_tty); + ch->ch_tun.un_tty->ldisc->ops->write_wakeup (ch->ch_tun.un_tty);spin_lock_irqsave (&ch->ch_lock, flags); }
@@ -978,7 +978,7 @@ void dgnc_wakeup_writes(struct channel_t *ch)if ((ch->ch_pun.un_tty->flags & (1 <<TTY_DO_WRITE_WAKEUP )) && ch->ch_pun.un_tty->ldisc->ops->write_wakeup) {spin_unlock_irqrestore (&ch->ch_lock, flags); - (ch->ch_pun.un_tty->ldisc->ops->write_wakeup)(ch->ch_pun.un_tty); + ch->ch_pun.un_tty->ldisc->ops->write_wakeup (ch->ch_pun.un_tty);spin_lock_irqsave (&ch->ch_lock, flags); }
Signature · 1 line
1.9.1