Commit 629c7349 authored by Ioana Ciornei's avatar Ioana Ciornei Committed by Greg Kroah-Hartman

staging: dgap: properly indent to match open paranthesis

Indent parameters and arguments passed to function calls to match
open paranthesis
Signed-off-by: default avatarIoana Ciornei <ciorneiioana@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fb795c68
...@@ -931,8 +931,8 @@ static int dgap_parsefile(char **in) ...@@ -931,8 +931,8 @@ static int dgap_parsefile(char **in)
brd->u.board.conc1++; brd->u.board.conc1++;
conc_type = dgap_gettok(in); conc_type = dgap_gettok(in);
if (conc_type == 0 || (conc_type != CX && if (conc_type == 0 ||
conc_type != EPC)) { (conc_type != CX && conc_type != EPC)) {
pr_err("failed to set a type of concentratros"); pr_err("failed to set a type of concentratros");
return -1; return -1;
} }
...@@ -972,8 +972,8 @@ static int dgap_parsefile(char **in) ...@@ -972,8 +972,8 @@ static int dgap_parsefile(char **in)
brd->u.board.module1++; brd->u.board.module1++;
module_type = dgap_gettok(in); module_type = dgap_gettok(in);
if (module_type == 0 || (module_type != PORTS && if (module_type == 0 ||
module_type != MODEM)) { (module_type != PORTS && module_type != MODEM)) {
pr_err("failed to set a type of module"); pr_err("failed to set a type of module");
return -1; return -1;
} }
...@@ -1351,8 +1351,7 @@ static int dgap_remap(struct board_t *brd) ...@@ -1351,8 +1351,7 @@ static int dgap_remap(struct board_t *brd)
if (!request_mem_region(brd->membase, 0x200000, "dgap")) if (!request_mem_region(brd->membase, 0x200000, "dgap"))
return -ENOMEM; return -ENOMEM;
if (!request_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000, if (!request_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000, "dgap"))
"dgap"))
goto err_req_mem; goto err_req_mem;
brd->re_map_membase = ioremap(brd->membase, 0x200000); brd->re_map_membase = ioremap(brd->membase, 0x200000);
...@@ -2161,7 +2160,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id, ...@@ -2161,7 +2160,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id,
/* init our poll helper tasklet */ /* init our poll helper tasklet */
tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet, tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet,
(unsigned long) brd); (unsigned long)brd);
ret = dgap_remap(brd); ret = dgap_remap(brd);
if (ret) if (ret)
...@@ -3575,7 +3574,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, ...@@ -3575,7 +3574,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
*/ */
if ((un->un_type == DGAP_PRINT) && !(ch->ch_flags & CH_PRON)) { if ((un->un_type == DGAP_PRINT) && !(ch->ch_flags & CH_PRON)) {
dgap_wmove(ch, ch->ch_digi.digi_onstr, dgap_wmove(ch, ch->ch_digi.digi_onstr,
(int) ch->ch_digi.digi_onlen); (int)ch->ch_digi.digi_onlen);
head = readw(&(bs->tx_head)) & tmask; head = readw(&(bs->tx_head)) & tmask;
ch->ch_flags |= CH_PRON; ch->ch_flags |= CH_PRON;
} }
...@@ -3586,7 +3585,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, ...@@ -3586,7 +3585,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
*/ */
if ((un->un_type != DGAP_PRINT) && (ch->ch_flags & CH_PRON)) { if ((un->un_type != DGAP_PRINT) && (ch->ch_flags & CH_PRON)) {
dgap_wmove(ch, ch->ch_digi.digi_offstr, dgap_wmove(ch, ch->ch_digi.digi_offstr,
(int) ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
head = readw(&(bs->tx_head)) & tmask; head = readw(&(bs->tx_head)) & tmask;
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
...@@ -3644,7 +3643,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, ...@@ -3644,7 +3643,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
writeb(1, &(bs->iempty)); writeb(1, &(bs->iempty));
} else { } else {
dgap_wmove(ch, ch->ch_digi.digi_offstr, dgap_wmove(ch, ch->ch_digi.digi_offstr,
(int) ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
head = readw(&(bs->tx_head)) & tmask; head = readw(&(bs->tx_head)) & tmask;
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
...@@ -4615,7 +4614,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file) ...@@ -4615,7 +4614,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
*/ */
if ((un->un_type == DGAP_PRINT) && (ch->ch_flags & CH_PRON)) { if ((un->un_type == DGAP_PRINT) && (ch->ch_flags & CH_PRON)) {
dgap_wmove(ch, ch->ch_digi.digi_offstr, dgap_wmove(ch, ch->ch_digi.digi_offstr,
(int) ch->ch_digi.digi_offlen); (int)ch->ch_digi.digi_offlen);
ch->ch_flags &= ~CH_PRON; ch->ch_flags &= ~CH_PRON;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment