staging: dgap: fix multiple checkpatch issues

Indent parameters and arguments passed to function calls to match open paranthesis

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

Quoted 4 lines · Ioana Ciornei

Indent parameters and arguments passed to function calls to match open paranthesis

Signed-off-by Ioana Ciornei <[email protected]>

Mostly looking good, two questions. See below:

Quoted 3 lines

---
 drivers/staging/dgap/dgap.c | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

<snip>

drivers/staging/dgap/dgap.c static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, · line 3541

Quoted 5 lines

drivers/staging/dgap/dgap.c +0 -1

@@ -3538,10 +3538,10 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
                return 0;
 
        spin_lock_irqsave(&ch->ch_lock, lock_flags);
-

Why remove this new line?

drivers/staging/dgap/dgap.c static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, · line 3544

Quoted 4 lines

drivers/staging/dgap/dgap.c +1 -0

        /* Get our space available for the channel from the board */
        tmask = ch->ch_tsize - 1;
        head = readw(&(bs->tx_head)) & tmask;
+

Why add this one here?

drivers/staging/dgap/dgap.c static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf, · line 3546

Quoted 2 lines

drivers/staging/dgap/dgap.c +0 -0

        tail = readw(&(bs->tx_tail)) & tmask;
 

thanks Ioana!

Daniel.

Indent parameters and arguments passed to function calls to match open paranthesis

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

drivers/staging/dgap/dgap.c +0 -0

index 2d36ea5..a47f5eb 100644

drivers/staging/dgap/dgap.c +2 -2

 {
 	int l = *len;
 	int count = 0;

@@ -1649,7 +1649,7 @@ static void dgap_input(struct channel_t *ch)
 
 		len = tty_buffer_request_room(tp->port, len);
 		tty_insert_flip_string_flags(tp->port, ch->ch_bd->flipbuf,
-			ch->ch_bd->flipflagbuf, len);
+					     ch->ch_bd->flipflagbuf, len);
 	} else {
 		len = tty_buffer_request_room(tp->port, len);
 		tty_insert_flip_string(tp->port, ch->ch_bd->flipbuf, len);

@@ -2161,7 +2161,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id,
 
 	/* init our poll helper tasklet */
 	tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet,
-			(unsigned long) brd);
+		     (unsigned long)brd);
 
 	ret = dgap_remap(brd);
 	if (ret)

drivers/staging/dgap/dgap.c +19 -20

 {
 	char __iomem *vaddr;
 	struct __iomem cm_t *cm_addr;

@@ -3011,7 +3011,7 @@ static int dgap_block_til_ready(struct tty_struct *tty, struct file *file,
 	int sleep_on_un_flags;
 
 	if (!tty || tty->magic != TTY_MAGIC || !file || !ch ||
-		ch->magic != DGAP_CHANNEL_MAGIC)
+	    ch->magic != DGAP_CHANNEL_MAGIC)
 		return -EIO;
 
 	un = tty->driver_data;

@@ -3509,7 +3509,7 @@ static int dgap_tty_write_room(struct tty_struct *tty)
  * In here exists all the Transparent Print magic as well.
  */
 static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
-				int count)
+			  int count)
 {
 	struct channel_t *ch;
 	struct un_t *un;

@@ -3538,10 +3538,10 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
 		return 0;
 
 	spin_lock_irqsave(&ch->ch_lock, lock_flags);
-
 	/* Get our space available for the channel from the board */
 	tmask = ch->ch_tsize - 1;
 	head = readw(&(bs->tx_head)) & tmask;
+
 	tail = readw(&(bs->tx_tail)) & tmask;
 
 	bufcount = tail - head - 1;

@@ -3575,7 +3575,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)) {
 		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;
 		ch->ch_flags |= CH_PRON;
 	}

@@ -3586,7 +3586,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)) {
 		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;
 		ch->ch_flags &= ~CH_PRON;
 	}

@@ -3644,7 +3644,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
 			writeb(1, &(bs->iempty));
 		} else {
 			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;
 			ch->ch_flags &= ~CH_PRON;
 		}

@@ -3731,7 +3731,7 @@ static int dgap_tty_tiocmget(struct tty_struct *tty)
  * Set modem signals, called by ld.
  */
 static int dgap_tty_tiocmset(struct tty_struct *tty,
-		unsigned int set, unsigned int clear)
+			     unsigned int set, unsigned int clear)
 {
 	struct board_t *bd;
 	struct channel_t *ch;

@@ -4222,7 +4222,7 @@ static int dgap_tty_digisetcustombaud(struct channel_t *ch, struct board_t *bd,
  * dgap_set_termios()
  */
 static void dgap_tty_set_termios(struct tty_struct *tty,
-				struct ktermios *old_termios)
+				 struct ktermios *old_termios)
 {
 	struct board_t *bd;
 	struct channel_t *ch;

@@ -4385,7 +4385,7 @@ static int dgap_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;

@@ -4597,7 +4597,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
 			 * have been dropped for modems to see it.
 			 */
 			spin_unlock_irqrestore(&ch->ch_lock,
-					lock_flags);
+					       lock_flags);
 
 			/* .25 second delay for dropping RTS/DTR */
 			schedule_timeout_interruptible(msecs_to_jiffies(250));

@@ -4615,7 +4615,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
 	 */
 	if ((un->un_type == DGAP_PRINT)  && (ch->ch_flags & CH_PRON)) {
 		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;
 	}
 

@@ -4750,7 +4750,7 @@ static void dgap_tty_flush_chars(struct tty_struct *tty)
  * The usual assortment of ioctl's
  */
 static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
-		unsigned long arg)
+			  unsigned long arg)
 {
 	struct board_t *bd;
 	struct channel_t *ch;

@@ -5996,7 +5996,7 @@ static int dgap_test_bios(struct board_t *brd)
 	err1 = readw(addr + SEQUENCE);
 	err2 = readw(addr + ERROR);
 	dev_warn(&brd->pdev->dev, "%s failed diagnostics.  Error #(%x,%x).\n",
-		brd->name, err1, err2);
+		 brd->name, err1, err2);
 	brd->state = BOARD_FAILED;
 	brd->dpastatus = BD_NOBIOS;
 

@@ -6531,7 +6531,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
 	if (fw_info[card_type].conf_name) {
 		ret = request_firmware(&fw, fw_info[card_type].conf_name,
-					 &pdev->dev);
+				       &pdev->dev);
 		if (ret) {
 			dev_err(&pdev->dev, "config file %s not found\n",
 				fw_info[card_type].conf_name);

@@ -6584,7 +6584,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
 	if (fw_info[card_type].bios_name) {
 		ret = request_firmware(&fw, fw_info[card_type].bios_name,
-					&pdev->dev);
+				       &pdev->dev);
 		if (ret) {
 			dev_err(&pdev->dev, "bios file %s not found\n",
 				fw_info[card_type].bios_name);

@@ -6601,7 +6601,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
 	if (fw_info[card_type].fep_name) {
 		ret = request_firmware(&fw, fw_info[card_type].fep_name,
-					&pdev->dev);
+				       &pdev->dev);
 		if (ret) {
 			dev_err(&pdev->dev, "dgap: fep file %s not found\n",
 				fw_info[card_type].fep_name);

@@ -6630,7 +6630,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
 	if (fw_info[card_type].con_name && check && vaddr) {
 		ret = request_firmware(&fw, fw_info[card_type].con_name,
-					&pdev->dev);
+				       &pdev->dev);
 		if (ret) {
 			dev_err(&pdev->dev, "conc file %s not found\n",
 				fw_info[card_type].con_name);

@@ -6994,8 +6994,8 @@ static int dgap_start(void)
 	}
 
 	device = device_create(dgap_class, NULL,
-		MKDEV(DIGI_DGAP_MAJOR, 0),
-		NULL, "dgap_mgmt");
+			       MKDEV(DIGI_DGAP_MAJOR, 0),
+			       NULL, "dgap_mgmt");
 	if (IS_ERR(device)) {
 		rc = PTR_ERR(device);
 		goto failed_device;
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/6a5c7c89e9bc61382ab763935b0f9b9442f67cb9.1445382697.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 14 lines · Ioana Ciornei

Indent parameters and arguments passed to function calls to match open paranthesis

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 52 ++++++++++++++++++++++-----------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

drivers/staging/dgap/dgap.c +0 -0

index 2d36ea5..a47f5eb 100644
@@ -932,7 +932,7 @@ static int dgap_parsefile(char **in)
 

drivers/staging/dgap/dgap.c static int dgap_parsefile(char **in) · line 935

Quoted 4 lines

drivers/staging/dgap/dgap.c +1 -1

                      conc_type = dgap_gettok(in);
                      if (conc_type == 0 || (conc_type != CX &&
-                         conc_type != EPC)) {
+                                            conc_type != EPC)) {

Maybe it would be nicer to put a newline after the ||, to have the whole conjunction on one line?

Quoted 6 lines

drivers/staging/dgap/dgap.c +0 -0

                              pr_err("failed to set a type of concentratros");
                              return -1;
                      }

@@ -973,7 +973,7 @@ static int dgap_parsefile(char **in)
 

drivers/staging/dgap/dgap.c static int dgap_parsefile(char **in) · line 976

Quoted 4 lines

drivers/staging/dgap/dgap.c +1 -1

                      module_type = dgap_gettok(in);
                      if (module_type == 0 || (module_type != PORTS &&
-                         module_type != MODEM)) {
+                                              module_type != MODEM)) {

Same here.

Quoted 7 lines

drivers/staging/dgap/dgap.c +0 -0

                              pr_err("failed to set a type of module");
                              return -1;
                      }

@@ -1352,7 +1352,7 @@ static int dgap_remap(struct board_t *brd)
              return -ENOMEM;
 

drivers/staging/dgap/dgap.c static int dgap_remap(struct board_t *brd) · line 1355

Quoted 3 lines

drivers/staging/dgap/dgap.c +1 -1

      if (!request_mem_region(brd->membase + PCI_IO_OFFSET, 0x200000,
-                                     "dgap"))
+                             "dgap"))

Does it not work just to put the string up on the line before with the function call?

drivers/staging/dgap/dgap.c static void dgap_unmap(struct board_t *brd) · line 1393

Quoted 10 lines

drivers/staging/dgap/dgap.c +1 -1

              goto err_req_mem;
 
      brd->re_map_membase = ioremap(brd->membase, 0x200000);

@@ -1390,7 +1390,7 @@ static void dgap_unmap(struct board_t *brd)
  * the Linux line discipline way.
  */
 static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
-                             unsigned char *fbuf, int *len)
+                          unsigned char *fbuf, int *len)

Not sure why this is an improvement. It looks like it was already aligned with the right side of the (.

Quoted 19 lines

drivers/staging/dgap/dgap.c +2 -2

 {
      int l = *len;
      int count = 0;

@@ -1649,7 +1649,7 @@ static void dgap_input(struct channel_t *ch)
 
              len = tty_buffer_request_room(tp->port, len);
              tty_insert_flip_string_flags(tp->port, ch->ch_bd->flipbuf,
-                     ch->ch_bd->flipflagbuf, len);
+                                          ch->ch_bd->flipflagbuf, len);
      } else {
              len = tty_buffer_request_room(tp->port, len);
              tty_insert_flip_string(tp->port, ch->ch_bd->flipbuf, len);

@@ -2161,7 +2161,7 @@ static struct board_t *dgap_found_board(struct pci_dev *pdev, int id,
 
      /* init our poll helper tasklet */
      tasklet_init(&brd->helper_tasklet, dgap_poll_tasklet,
-                     (unsigned long) brd);
+                  (unsigned long)brd);
 

drivers/staging/dgap/dgap.c schedule_poller: · line 2345

Quoted 8 lines

drivers/staging/dgap/dgap.c +1 -1

      ret = dgap_remap(brd);
      if (ret)

@@ -2342,7 +2342,7 @@ schedule_poller:
  *
  *=======================================================================*/
 static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
-                     u8 byte2, uint ncmds)
+                   u8 byte2, uint ncmds)

It doesn't look like this is aligned, but I didn't try applying the patch.

julia

Quoted 180 lines

drivers/staging/dgap/dgap.c +19 -20

 {
      char __iomem *vaddr;
      struct __iomem cm_t *cm_addr;

@@ -3011,7 +3011,7 @@ static int dgap_block_til_ready(struct tty_struct *tty, struct file *file,
      int sleep_on_un_flags;
 
      if (!tty || tty->magic != TTY_MAGIC || !file || !ch ||
-             ch->magic != DGAP_CHANNEL_MAGIC)
+         ch->magic != DGAP_CHANNEL_MAGIC)
              return -EIO;
 
      un = tty->driver_data;

@@ -3509,7 +3509,7 @@ static int dgap_tty_write_room(struct tty_struct *tty)
  * In here exists all the Transparent Print magic as well.
  */
 static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
-                             int count)
+                       int count)
 {
      struct channel_t *ch;
      struct un_t *un;

@@ -3538,10 +3538,10 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
              return 0;
 
      spin_lock_irqsave(&ch->ch_lock, lock_flags);
-
      /* Get our space available for the channel from the board */
      tmask = ch->ch_tsize - 1;
      head = readw(&(bs->tx_head)) & tmask;
+
      tail = readw(&(bs->tx_tail)) & tmask;
 
      bufcount = tail - head - 1;

@@ -3575,7 +3575,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)) {
              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;
              ch->ch_flags |= CH_PRON;
      }

@@ -3586,7 +3586,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)) {
              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;
              ch->ch_flags &= ~CH_PRON;
      }

@@ -3644,7 +3644,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
                      writeb(1, &(bs->iempty));
              } else {
                      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;
                      ch->ch_flags &= ~CH_PRON;
              }

@@ -3731,7 +3731,7 @@ static int dgap_tty_tiocmget(struct tty_struct *tty)
  * Set modem signals, called by ld.
  */
 static int dgap_tty_tiocmset(struct tty_struct *tty,
-             unsigned int set, unsigned int clear)
+                          unsigned int set, unsigned int clear)
 {
      struct board_t *bd;
      struct channel_t *ch;

@@ -4222,7 +4222,7 @@ static int dgap_tty_digisetcustombaud(struct channel_t *ch, struct board_t *bd,
  * dgap_set_termios()
  */
 static void dgap_tty_set_termios(struct tty_struct *tty,
-                             struct ktermios *old_termios)
+                              struct ktermios *old_termios)
 {
      struct board_t *bd;
      struct channel_t *ch;

@@ -4385,7 +4385,7 @@ static int dgap_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;

@@ -4597,7 +4597,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
                       * have been dropped for modems to see it.
                       */
                      spin_unlock_irqrestore(&ch->ch_lock,
-                                     lock_flags);
+                                            lock_flags);
 
                      /* .25 second delay for dropping RTS/DTR */
                      schedule_timeout_interruptible(msecs_to_jiffies(250));

@@ -4615,7 +4615,7 @@ static void dgap_tty_close(struct tty_struct *tty, struct file *file)
       */
      if ((un->un_type == DGAP_PRINT)  && (ch->ch_flags & CH_PRON)) {
              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;
      }
 

@@ -4750,7 +4750,7 @@ static void dgap_tty_flush_chars(struct tty_struct *tty)
  * The usual assortment of ioctl's
  */
 static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
-             unsigned long arg)
+                       unsigned long arg)
 {
      struct board_t *bd;
      struct channel_t *ch;

@@ -5996,7 +5996,7 @@ static int dgap_test_bios(struct board_t *brd)
      err1 = readw(addr + SEQUENCE);
      err2 = readw(addr + ERROR);
      dev_warn(&brd->pdev->dev, "%s failed diagnostics.  Error #(%x,%x).\n",
-             brd->name, err1, err2);
+              brd->name, err1, err2);
      brd->state = BOARD_FAILED;
      brd->dpastatus = BD_NOBIOS;
 

@@ -6531,7 +6531,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
      if (fw_info[card_type].conf_name) {
              ret = request_firmware(&fw, fw_info[card_type].conf_name,
-                                      &pdev->dev);
+                                    &pdev->dev);
              if (ret) {
                      dev_err(&pdev->dev, "config file %s not found\n",
                              fw_info[card_type].conf_name);

@@ -6584,7 +6584,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
      if (fw_info[card_type].bios_name) {
              ret = request_firmware(&fw, fw_info[card_type].bios_name,
-                                     &pdev->dev);
+                                    &pdev->dev);
              if (ret) {
                      dev_err(&pdev->dev, "bios file %s not found\n",
                              fw_info[card_type].bios_name);

@@ -6601,7 +6601,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
      if (fw_info[card_type].fep_name) {
              ret = request_firmware(&fw, fw_info[card_type].fep_name,
-                                     &pdev->dev);
+                                    &pdev->dev);
              if (ret) {
                      dev_err(&pdev->dev, "dgap: fep file %s not found\n",
                              fw_info[card_type].fep_name);

@@ -6630,7 +6630,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 
      if (fw_info[card_type].con_name && check && vaddr) {
              ret = request_firmware(&fw, fw_info[card_type].con_name,
-                                     &pdev->dev);
+                                    &pdev->dev);
              if (ret) {
                      dev_err(&pdev->dev, "conc file %s not found\n",
                              fw_info[card_type].con_name);

@@ -6994,8 +6994,8 @@ static int dgap_start(void)
      }
 
      device = device_create(dgap_class, NULL,
-             MKDEV(DIGI_DGAP_MAJOR, 0),
-             NULL, "dgap_mgmt");
+                            MKDEV(DIGI_DGAP_MAJOR, 0),
+                            NULL, "dgap_mgmt");
      if (IS_ERR(device)) {
              rc = PTR_ERR(device);
              goto failed_device;
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/6a5c7c89e9bc61382ab763935b0f9b9442f67cb9.1445382697.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 5 lines

drivers/staging/dgap/dgap.c schedule_poller: · line 2345

Quoted 3 lines

static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,

drivers/staging/dgap/dgap.c +1 -1

-                     u8 byte2, uint ncmds)
+                   u8 byte2, uint ncmds)

It doesn't look like this is aligned, but I didn't try applying the patch.

I think that the email format or the patch does not show the tabs in the proper way.
I remember that there were some off by one alignments and this and the previous one belong to them.
Nevertheless, I will take a look.

Quoted 11 lines

Quoted 5 lines

drivers/staging/dgap/dgap.c schedule_poller: · line 2345

Quoted 3 lines

static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,

drivers/staging/dgap/dgap.c +1 -1

-                     u8 byte2, uint ncmds)
+                   u8 byte2, uint ncmds)

It doesn't look like this is aligned, but I didn't try applying the patch.

I think that the email format or the patch does not show the tabs in the proper way.
I remember that there were some off by one alignments and this and the previous one belong to them.
Nevertheless, I will take a look.

OK, quite possible. But it is strange that all of the function calls look fine with their added and removed lines, and all of the function headers look wrong.

julia

Quoted 16 lines · Julia Lawall

Quoted 11 lines

Quoted 5 lines

drivers/staging/dgap/dgap.c schedule_poller: · line 2345

Quoted 3 lines

static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,

drivers/staging/dgap/dgap.c +1 -1

-                     u8 byte2, uint ncmds)
+                   u8 byte2, uint ncmds)

It doesn't look like this is aligned, but I didn't try applying the patch.

I think that the email format or the patch does not show the tabs in the proper way.
I remember that there were some off by one alignments and this and the previous one belong to them.
Nevertheless, I will take a look.

OK, quite possible. But it is strange that all of the function calls look fine with their added and removed lines, and all of the function headers look wrong.

Quoted 1 line

julia

It's very strange but the alignment seems proper when the patch is applied. I really do not have an explanation for the email format. I verified it, made the other changes suggested and resent it.

This patch removes unnecessary spaces after the cast. Patch done with coccinelle semantic patch:

@rule0@
type t;
identifier e;
constant c;
expression expr;
@@

(
- (t) e
+ (t)e
|
- (t) c
+ (t)c
|
- (t) expr
+ (t)expr

)

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 88 ++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

drivers/staging/dgap/dgap.c +44 -45

index a47f5eb..fe29ff3 100644
@@ -1413,7 +1413,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
 		case 0:
 			/* No FF seen yet */
-			if (c == (unsigned char) '\377')
+			if (c == (unsigned char)'\377')
 				/* delete this character from stream */
 				ch->pscan_state = 1;
 			else {

@@ -1425,7 +1425,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
 		case 1:
 			/* first FF seen */
-			if (c == (unsigned char) '\377') {
+			if (c == (unsigned char)'\377') {
 				/* doubled ff, transform to single ff */
 				*cout++ = c;
 				*fout++ = TTY_NORMAL;

@@ -1837,7 +1837,7 @@ static int dgap_event(struct board_t *bd)
 		return -EIO;
 	}
 
-	eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+	eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
 	/* Get our head and tail */
 	head = readw(&(eaddr->ev_head));

@@ -1994,7 +1994,7 @@ next:
  */
 static void dgap_poll_tasklet(unsigned long data)
 {
-	struct board_t *bd = (struct board_t *) data;
+	struct board_t *bd = (struct board_t *)data;
 	ulong lock_flags;
 	char __iomem *vaddr;
 	u16 head, tail;

@@ -2027,7 +2027,7 @@ static void dgap_poll_tasklet(unsigned long data)
 		if (!bd->nasync)
 			goto out;
 
-		eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+		eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
 		/* Get our head and tail */
 		head = readw(&(eaddr->ev_head));

@@ -2262,7 +2262,7 @@ static void dgap_poll_handler(ulong dummy)
 				continue;
 			if (!brd->intr_running)
 				/* Call the real board poller directly */
-				dgap_poll_tasklet((unsigned long) brd);
+				dgap_poll_tasklet((unsigned long)brd);
 		}
 	} else {
 		/*

@@ -2315,7 +2315,7 @@ schedule_poller:
 
 	new_time = dgap_poll_time - jiffies;
 
-	if ((ulong) new_time >= 2 * dgap_poll_tick) {
+	if ((ulong)new_time >= 2 * dgap_poll_tick) {
 		dgap_poll_time =
 			jiffies +  dgap_jiffies_from_ms(dgap_poll_tick);
 	}

@@ -2369,7 +2369,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
 	if (!vaddr)
 		return;
 
-	cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+	cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
 	head = readw(&(cm_addr->cm_head));
 
 	/*

@@ -2384,7 +2384,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
 	 * Put the data in the circular command buffer.
 	 */
 	writeb(cmd, (vaddr + head + CMDSTART + 0));
-	writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+	writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
 	writeb(byte1, (vaddr + head + CMDSTART + 2));
 	writeb(byte2, (vaddr + head + CMDSTART + 3));
 

@@ -2452,7 +2452,7 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
 	if (!vaddr)
 		return;
 
-	cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+	cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
 	head = readw(&(cm_addr->cm_head));
 
 	/*

@@ -2467,8 +2467,8 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
 	 * Put the data in the circular command buffer.
 	 */
 	writeb(cmd, (vaddr + head + CMDSTART + 0));
-	writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-	writew((u16) word, (vaddr + head + CMDSTART + 2));
+	writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+	writew((u16)word, (vaddr + head + CMDSTART + 2));
 
 	head = (head + 4) & (CMDMAX - CMDSTART - 4);
 

@@ -2534,7 +2534,7 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
 	if (!vaddr)
 		return;
 
-	cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+	cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
 	head = readw(&(cm_addr->cm_head));
 
 	/*

@@ -2550,19 +2550,19 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
 	 */
 
 	/* Write an FF to tell the FEP that we want an extended command */
-	writeb((u8) 0xff, (vaddr + head + CMDSTART + 0));
+	writeb((u8)0xff, (vaddr + head + CMDSTART + 0));
 
-	writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-	writew((u16) cmd, (vaddr + head + CMDSTART + 2));
+	writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+	writew((u16)cmd, (vaddr + head + CMDSTART + 2));
 
 	/*
 	 * If the second part of the command won't fit,
 	 * put it at the beginning of the circular buffer.
 	 */
 	if (((head + 4) >= ((CMDMAX - CMDSTART)) || (head & 03)))
-		writew((u16) word, (vaddr + CMDSTART));
+		writew((u16)word, (vaddr + CMDSTART));
 	else
-		writew((u16) word, (vaddr + head + CMDSTART + 4));
+		writew((u16)word, (vaddr + head + CMDSTART + 4));
 
 	head = (head + 8) & (CMDMAX - CMDSTART - 4);
 

@@ -2860,13 +2860,13 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
 		cflag &= 0xffff;
 
 		if (cflag != ch->ch_fepcflag) {
-			ch->ch_fepcflag = (u16) (cflag & 0xffff);
+			ch->ch_fepcflag = (u16)(cflag & 0xffff);
 
 			/*
 			 * Okay to have channel and board
 			 * locks held calling this
 			 */
-			dgap_cmdw(ch, SCFLAG, (u16) cflag, 0);
+			dgap_cmdw(ch, SCFLAG, (u16)cflag, 0);
 		}
 
 		/* Handle transition from B0 */

@@ -2907,7 +2907,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
 		ch->ch_fepiflag = iflag;
 
 		/* Okay to have channel and board locks held calling this */
-		dgap_cmdw(ch, SIFLAG, (u16) ch->ch_fepiflag, 0);
+		dgap_cmdw(ch, SIFLAG, (u16)ch->ch_fepiflag, 0);
 	}
 
 	/*

@@ -2932,7 +2932,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
 		ch->ch_hflow = hflow;
 
 		/* Okay to have channel and board locks held calling this */
-		dgap_cmdb(ch, SHFLOW, (u8) hflow, 0xff, 0);
+		dgap_cmdb(ch, SHFLOW, (u8)hflow, 0xff, 0);
 	}
 
 	/*

@@ -2960,7 +2960,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
 		ch->ch_mostat = mval;
 
 		/* Okay to have channel and board locks held calling this */
-		dgap_cmdb(ch, SMODEM, (u8) mval, D_RTS(ch)|D_DTR(ch), 0);
+		dgap_cmdb(ch, SMODEM, (u8)mval, D_RTS(ch) | D_DTR(ch), 0);
 	}
 
 	/*

@@ -3159,7 +3159,7 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty)
 
 	ch->ch_flags &= ~CH_STOP;
 	head = readw(&(ch->ch_bs->tx_head));
-	dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+	dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
 	dgap_cmdw(ch, RESUMETX, 0, 0);
 	if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
 		ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -3604,7 +3604,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
 		n -= remain;
 		vaddr = ch->ch_taddr + head;
 
-		memcpy_toio(vaddr, (u8 *) buf, remain);
+		memcpy_toio(vaddr, (u8 *)buf, remain);
 
 		head = ch->ch_tstart;
 		buf += remain;

@@ -3617,7 +3617,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
 		vaddr = ch->ch_taddr + head;
 		remain = n;
 
-		memcpy_toio(vaddr, (u8 *) buf, remain);
+		memcpy_toio(vaddr, (u8 *)buf, remain);
 		head += remain;
 	}
 

@@ -3830,7 +3830,7 @@ static int dgap_tty_send_break(struct tty_struct *tty, int msec)
 #if 0
 	dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
 #endif
-	dgap_cmdw(ch, SBREAK, (u16) msec, 0);
+	dgap_cmdw(ch, SBREAK, (u16)msec, 0);
 
 	spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
 	spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4152,7 +4152,7 @@ static int dgap_tty_digisetedelay(struct channel_t *ch, struct board_t *bd,
 	spin_lock_irqsave(&bd->bd_lock, lock_flags);
 	spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-	writew((u16) new_digi, &(ch->ch_bs->edelay));
+	writew((u16)new_digi, &ch->ch_bs->edelay);
 
 	dgap_param(ch, bd, un->un_type);
 

@@ -4759,7 +4759,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 	u16 head;
 	ulong lock_flags = 0;
 	ulong lock_flags2 = 0;
-	void __user *uarg = (void __user *) arg;
+	void __user *uarg = (void __user *)arg;
 
 	if (!tty || tty->magic != TTY_MAGIC)
 		return -ENODEV;

@@ -4811,7 +4811,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
 		if (((cmd == TCSBRK) && (!arg)) || (cmd == TCSBRKP))
-			dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+			dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
 		spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
 		spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4838,7 +4838,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		spin_lock_irqsave(&bd->bd_lock, lock_flags);
 		spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-		dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+		dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
 		spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
 		spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4865,7 +4865,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		spin_lock_irqsave(&bd->bd_lock, lock_flags);
 		spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-		dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+		dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
 		spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
 		spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4889,13 +4889,13 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 		spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
 		return put_user(C_CLOCAL(tty) ? 1 : 0,
-				(unsigned long __user *) arg);
+				(unsigned long __user *)arg);
 
 	case TIOCSSOFTCAR:
 		spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
 		spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
-		rc = get_user(arg, (unsigned long __user *) arg);
+		rc = get_user(arg, (unsigned long __user *)arg);
 		if (rc)
 			return rc;
 

@@ -4960,7 +4960,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
 		ch->ch_flags &= ~CH_STOP;
 		head = readw(&(ch->ch_bs->tx_head));
-		dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+		dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
 		dgap_cmdw(ch, RESUMETX, 0, 0);
 		if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
 			ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -5985,7 +5985,7 @@ static int dgap_test_bios(struct board_t *brd)
 	brd->wait_for_bios = 0;
 	while (brd->wait_for_bios < 1000) {
 		/* Check to see if BIOS thinks board is good. (GD). */
-		if (word == *(u16 *) "GD")
+		if (word == *(u16 *)"GD")
 			return 0;
 		msleep_interruptible(10);
 		brd->wait_for_bios++;

@@ -6071,12 +6071,12 @@ static int dgap_test_fep(struct board_t *brd)
 	brd->wait_for_fep = 0;
 	while (brd->wait_for_fep < 500) {
 		/* Check to see if FEP is up and running now. */
-		if (word == *(u16 *) "OS") {
+		if (word == *(u16 *)"OS") {
 			/*
 			 * Check to see if the board can support FEP5+ commands.
 			*/
 			word = readw(addr + FEP5_PLUS);
-			if (word == *(u16 *) "5A")
+			if (word == *(u16 *)"5A")
 				brd->bd_flags |= BD_FEP5PLUS;
 
 			return 0;

@@ -6162,8 +6162,8 @@ static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len)
 
 	vaddr = brd->re_map_membase;
 
-	offset = readw((u16 *) (vaddr + DOWNREQ));
-	to_dp = (struct downld_t *) (vaddr + (int) offset);
+	offset = readw((u16 *)(vaddr + DOWNREQ));
+	to_dp = (struct downld_t *)(vaddr + (int)offset);
 	memcpy_toio(to_dp, uaddr, len);
 
 	/* Tell card we have data for it */

@@ -6622,7 +6622,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 	 * is requesting a concentrator image from us.
 	 */
 	if ((bd->type == PCX) || (bd->type == PEPC)) {
-		chk_addr = (u16 *) (vaddr + DOWNREQ);
+		chk_addr = (u16 *)(vaddr + DOWNREQ);
 		/* Nonzero if FEP is requesting concentrator image. */
 		check = readw(chk_addr);
 		vaddr = brd->re_map_membase;

@@ -6637,7 +6637,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
 			return ret;
 		}
 		/* Put concentrator firmware loading code here */
-		offset = readw((u16 *) (vaddr + DOWNREQ));
+		offset = readw((u16 *)(vaddr + DOWNREQ));
 		memcpy_toio(offset, fw->data, fw->size);
 
 		dgap_do_conc_load(brd, (char *)fw->data, fw->size)

@@ -6720,8 +6720,8 @@ static int dgap_tty_init(struct board_t *brd)
 	ch = brd->channels[0];
 	vaddr = brd->re_map_membase;
 
-	bs = (struct bs_t __iomem *) ((ulong) vaddr + CHANBUF);
-	cm = (struct cm_t __iomem *) ((ulong) vaddr + CMDBUF);
+	bs = (struct bs_t __iomem *)((ulong)vaddr + CHANBUF);
+	cm = (struct cm_t __iomem *)((ulong)vaddr + CMDBUF);
 
 	brd->bd_bs = bs;
 
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/d884ca2435043329459e463d282995002ab72e6f.1445382697.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 10 lines · Ioana Ciornei

This patch removes unnecessary spaces after the cast. Patch done with coccinelle semantic patch:

@rule0@
type t;
identifier e;
constant c;
expression expr;
@@

Quoted 9 lines

(
- (t) e
+ (t)e
|
- (t) c
+ (t)c
|
- (t) expr
+ (t)expr

Again, you are actually just removing all expressions with casts, regardless of spacing, and then adding them back with the default Coccinelle pretty printing strategy. But it is true that the semantic patch does represent clearly what you are intending to do.

julia

Quoted 370 lines

)

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 88 ++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

drivers/staging/dgap/dgap.c +44 -45

index a47f5eb..fe29ff3 100644
@@ -1413,7 +1413,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
              case 0:
                      /* No FF seen yet */
-                     if (c == (unsigned char) '\377')
+                     if (c == (unsigned char)'\377')
                              /* delete this character from stream */
                              ch->pscan_state = 1;
                      else {

@@ -1425,7 +1425,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
              case 1:
                      /* first FF seen */
-                     if (c == (unsigned char) '\377') {
+                     if (c == (unsigned char)'\377') {
                              /* doubled ff, transform to single ff */
                              *cout++ = c;
                              *fout++ = TTY_NORMAL;

@@ -1837,7 +1837,7 @@ static int dgap_event(struct board_t *bd)
              return -EIO;
      }
 
-     eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+     eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
      /* Get our head and tail */
      head = readw(&(eaddr->ev_head));

@@ -1994,7 +1994,7 @@ next:
  */
 static void dgap_poll_tasklet(unsigned long data)
 {
-     struct board_t *bd = (struct board_t *) data;
+     struct board_t *bd = (struct board_t *)data;
      ulong lock_flags;
      char __iomem *vaddr;
      u16 head, tail;

@@ -2027,7 +2027,7 @@ static void dgap_poll_tasklet(unsigned long data)
              if (!bd->nasync)
                      goto out;
 
-             eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+             eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
              /* Get our head and tail */
              head = readw(&(eaddr->ev_head));

@@ -2262,7 +2262,7 @@ static void dgap_poll_handler(ulong dummy)
                              continue;
                      if (!brd->intr_running)
                              /* Call the real board poller directly */
-                             dgap_poll_tasklet((unsigned long) brd);
+                             dgap_poll_tasklet((unsigned long)brd);
              }
      } else {
              /*

@@ -2315,7 +2315,7 @@ schedule_poller:
 
      new_time = dgap_poll_time - jiffies;
 
-     if ((ulong) new_time >= 2 * dgap_poll_tick) {
+     if ((ulong)new_time >= 2 * dgap_poll_tick) {
              dgap_poll_time =
                      jiffies +  dgap_jiffies_from_ms(dgap_poll_tick);
      }

@@ -2369,7 +2369,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2384,7 +2384,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
       * Put the data in the circular command buffer.
       */
      writeb(cmd, (vaddr + head + CMDSTART + 0));
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
      writeb(byte1, (vaddr + head + CMDSTART + 2));
      writeb(byte2, (vaddr + head + CMDSTART + 3));
 

@@ -2452,7 +2452,7 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2467,8 +2467,8 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
       * Put the data in the circular command buffer.
       */
      writeb(cmd, (vaddr + head + CMDSTART + 0));
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-     writew((u16) word, (vaddr + head + CMDSTART + 2));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writew((u16)word, (vaddr + head + CMDSTART + 2));
 
      head = (head + 4) & (CMDMAX - CMDSTART - 4);
 

@@ -2534,7 +2534,7 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2550,19 +2550,19 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
       */
 
      /* Write an FF to tell the FEP that we want an extended command */
-     writeb((u8) 0xff, (vaddr + head + CMDSTART + 0));
+     writeb((u8)0xff, (vaddr + head + CMDSTART + 0));
 
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-     writew((u16) cmd, (vaddr + head + CMDSTART + 2));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writew((u16)cmd, (vaddr + head + CMDSTART + 2));
 
      /*
       * If the second part of the command won't fit,
       * put it at the beginning of the circular buffer.
       */
      if (((head + 4) >= ((CMDMAX - CMDSTART)) || (head & 03)))
-             writew((u16) word, (vaddr + CMDSTART));
+             writew((u16)word, (vaddr + CMDSTART));
      else
-             writew((u16) word, (vaddr + head + CMDSTART + 4));
+             writew((u16)word, (vaddr + head + CMDSTART + 4));
 
      head = (head + 8) & (CMDMAX - CMDSTART - 4);
 

@@ -2860,13 +2860,13 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              cflag &= 0xffff;
 
              if (cflag != ch->ch_fepcflag) {
-                     ch->ch_fepcflag = (u16) (cflag & 0xffff);
+                     ch->ch_fepcflag = (u16)(cflag & 0xffff);
 
                      /*
                       * Okay to have channel and board
                       * locks held calling this
                       */
-                     dgap_cmdw(ch, SCFLAG, (u16) cflag, 0);
+                     dgap_cmdw(ch, SCFLAG, (u16)cflag, 0);
              }
 
              /* Handle transition from B0 */

@@ -2907,7 +2907,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_fepiflag = iflag;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdw(ch, SIFLAG, (u16) ch->ch_fepiflag, 0);
+             dgap_cmdw(ch, SIFLAG, (u16)ch->ch_fepiflag, 0);
      }
 
      /*

@@ -2932,7 +2932,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_hflow = hflow;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdb(ch, SHFLOW, (u8) hflow, 0xff, 0);
+             dgap_cmdb(ch, SHFLOW, (u8)hflow, 0xff, 0);
      }
 
      /*

@@ -2960,7 +2960,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_mostat = mval;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdb(ch, SMODEM, (u8) mval, D_RTS(ch)|D_DTR(ch), 0);
+             dgap_cmdb(ch, SMODEM, (u8)mval, D_RTS(ch) | D_DTR(ch), 0);
      }
 
      /*

@@ -3159,7 +3159,7 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty)
 
      ch->ch_flags &= ~CH_STOP;
      head = readw(&(ch->ch_bs->tx_head));
-     dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+     dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
      dgap_cmdw(ch, RESUMETX, 0, 0);
      if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
              ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -3604,7 +3604,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
              n -= remain;
              vaddr = ch->ch_taddr + head;
 
-             memcpy_toio(vaddr, (u8 *) buf, remain);
+             memcpy_toio(vaddr, (u8 *)buf, remain);
 
              head = ch->ch_tstart;
              buf += remain;

@@ -3617,7 +3617,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
              vaddr = ch->ch_taddr + head;
              remain = n;
 
-             memcpy_toio(vaddr, (u8 *) buf, remain);
+             memcpy_toio(vaddr, (u8 *)buf, remain);
              head += remain;
      }
 

@@ -3830,7 +3830,7 @@ static int dgap_tty_send_break(struct tty_struct *tty, int msec)
 #if 0
      dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
 #endif
-     dgap_cmdw(ch, SBREAK, (u16) msec, 0);
+     dgap_cmdw(ch, SBREAK, (u16)msec, 0);
 
      spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
      spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4152,7 +4152,7 @@ static int dgap_tty_digisetedelay(struct channel_t *ch, struct board_t *bd,
      spin_lock_irqsave(&bd->bd_lock, lock_flags);
      spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-     writew((u16) new_digi, &(ch->ch_bs->edelay));
+     writew((u16)new_digi, &ch->ch_bs->edelay);
 
      dgap_param(ch, bd, un->un_type);
 

@@ -4759,7 +4759,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
      u16 head;
      ulong lock_flags = 0;
      ulong lock_flags2 = 0;
-     void __user *uarg = (void __user *) arg;
+     void __user *uarg = (void __user *)arg;
 
      if (!tty || tty->magic != TTY_MAGIC)
              return -ENODEV;

@@ -4811,7 +4811,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
              if (((cmd == TCSBRK) && (!arg)) || (cmd == TCSBRKP))
-                     dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+                     dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4838,7 +4838,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&bd->bd_lock, lock_flags);
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-             dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+             dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4865,7 +4865,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&bd->bd_lock, lock_flags);
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-             dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+             dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4889,13 +4889,13 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
              return put_user(C_CLOCAL(tty) ? 1 : 0,
-                             (unsigned long __user *) arg);
+                             (unsigned long __user *)arg);
 
      case TIOCSSOFTCAR:
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
-             rc = get_user(arg, (unsigned long __user *) arg);
+             rc = get_user(arg, (unsigned long __user *)arg);
              if (rc)
                      return rc;
 

@@ -4960,7 +4960,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
              ch->ch_flags &= ~CH_STOP;
              head = readw(&(ch->ch_bs->tx_head));
-             dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+             dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
              dgap_cmdw(ch, RESUMETX, 0, 0);
              if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
                      ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -5985,7 +5985,7 @@ static int dgap_test_bios(struct board_t *brd)
      brd->wait_for_bios = 0;
      while (brd->wait_for_bios < 1000) {
              /* Check to see if BIOS thinks board is good. (GD). */
-             if (word == *(u16 *) "GD")
+             if (word == *(u16 *)"GD")
                      return 0;
              msleep_interruptible(10);
              brd->wait_for_bios++;

@@ -6071,12 +6071,12 @@ static int dgap_test_fep(struct board_t *brd)
      brd->wait_for_fep = 0;
      while (brd->wait_for_fep < 500) {
              /* Check to see if FEP is up and running now. */
-             if (word == *(u16 *) "OS") {
+             if (word == *(u16 *)"OS") {
                      /*
                       * Check to see if the board can support FEP5+ commands.
                      */
                      word = readw(addr + FEP5_PLUS);
-                     if (word == *(u16 *) "5A")
+                     if (word == *(u16 *)"5A")
                              brd->bd_flags |= BD_FEP5PLUS;
 
                      return 0;

@@ -6162,8 +6162,8 @@ static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len)
 
      vaddr = brd->re_map_membase;
 
-     offset = readw((u16 *) (vaddr + DOWNREQ));
-     to_dp = (struct downld_t *) (vaddr + (int) offset);
+     offset = readw((u16 *)(vaddr + DOWNREQ));
+     to_dp = (struct downld_t *)(vaddr + (int)offset);
      memcpy_toio(to_dp, uaddr, len);
 
      /* Tell card we have data for it */

@@ -6622,7 +6622,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
       * is requesting a concentrator image from us.
       */
      if ((bd->type == PCX) || (bd->type == PEPC)) {
-             chk_addr = (u16 *) (vaddr + DOWNREQ);
+             chk_addr = (u16 *)(vaddr + DOWNREQ);
              /* Nonzero if FEP is requesting concentrator image. */
              check = readw(chk_addr);
              vaddr = brd->re_map_membase;

@@ -6637,7 +6637,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
                      return ret;
              }
              /* Put concentrator firmware loading code here */
-             offset = readw((u16 *) (vaddr + DOWNREQ));
+             offset = readw((u16 *)(vaddr + DOWNREQ));
              memcpy_toio(offset, fw->data, fw->size);
 
              dgap_do_conc_load(brd, (char *)fw->data, fw->size)

@@ -6720,8 +6720,8 @@ static int dgap_tty_init(struct board_t *brd)
      ch = brd->channels[0];
      vaddr = brd->re_map_membase;
 
-     bs = (struct bs_t __iomem *) ((ulong) vaddr + CHANBUF);
-     cm = (struct cm_t __iomem *) ((ulong) vaddr + CMDBUF);
+     bs = (struct bs_t __iomem *)((ulong)vaddr + CHANBUF);
+     cm = (struct cm_t __iomem *)((ulong)vaddr + CMDBUF);
 
      brd->bd_bs = bs;
 
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/d884ca2435043329459e463d282995002ab72e6f.1445382697.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.

Quoted 27 lines · Julia Lawall

Quoted 10 lines · Ioana Ciornei

This patch removes unnecessary spaces after the cast. Patch done with coccinelle semantic patch:

@rule0@
type t;
identifier e;
constant c;
expression expr;
@@

Quoted 9 lines

(
- (t) e
+ (t)e
|
- (t) c
+ (t)c
|
- (t) expr
+ (t)expr

Again, you are actually just removing all expressions with casts, regardless of spacing, and then adding them back with the default Coccinelle pretty printing strategy. But it is true that the semantic patch does represent clearly what you are intending to do.

Quoted 1 line

julia

Now I understand why after applying some coccinelle patches like this one there were also other changes made to the code alongside the ones that I explicitly requested.

Was there any better way of doing this or I should leave it as it is?

Thanks,

Ioana

Quoted 370 lines

Quoted 370 lines

)

Signed-off-by Ioana Ciornei <[email protected]>

---
 drivers/staging/dgap/dgap.c | 88 ++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 44 deletions(-)

drivers/staging/dgap/dgap.c +44 -45

index a47f5eb..fe29ff3 100644
@@ -1413,7 +1413,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
              case 0:
                      /* No FF seen yet */
-                     if (c == (unsigned char) '\377')
+                     if (c == (unsigned char)'\377')
                              /* delete this character from stream */
                              ch->pscan_state = 1;
                      else {

@@ -1425,7 +1425,7 @@ static void dgap_parity_scan(struct channel_t *ch, unsigned char *cbuf,
 
              case 1:
                      /* first FF seen */
-                     if (c == (unsigned char) '\377') {
+                     if (c == (unsigned char)'\377') {
                              /* doubled ff, transform to single ff */
                              *cout++ = c;
                              *fout++ = TTY_NORMAL;

@@ -1837,7 +1837,7 @@ static int dgap_event(struct board_t *bd)
              return -EIO;
      }
 
-     eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+     eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
      /* Get our head and tail */
      head = readw(&(eaddr->ev_head));

@@ -1994,7 +1994,7 @@ next:
  */
 static void dgap_poll_tasklet(unsigned long data)
 {
-     struct board_t *bd = (struct board_t *) data;
+     struct board_t *bd = (struct board_t *)data;
      ulong lock_flags;
      char __iomem *vaddr;
      u16 head, tail;

@@ -2027,7 +2027,7 @@ static void dgap_poll_tasklet(unsigned long data)
              if (!bd->nasync)
                      goto out;
 
-             eaddr = (struct ev_t __iomem *) (vaddr + EVBUF);
+             eaddr = (struct ev_t __iomem *)(vaddr + EVBUF);
 
              /* Get our head and tail */
              head = readw(&(eaddr->ev_head));

@@ -2262,7 +2262,7 @@ static void dgap_poll_handler(ulong dummy)
                              continue;
                      if (!brd->intr_running)
                              /* Call the real board poller directly */
-                             dgap_poll_tasklet((unsigned long) brd);
+                             dgap_poll_tasklet((unsigned long)brd);
              }
      } else {
              /*

@@ -2315,7 +2315,7 @@ schedule_poller:
 
      new_time = dgap_poll_time - jiffies;
 
-     if ((ulong) new_time >= 2 * dgap_poll_tick) {
+     if ((ulong)new_time >= 2 * dgap_poll_tick) {
              dgap_poll_time =
                      jiffies +  dgap_jiffies_from_ms(dgap_poll_tick);
      }

@@ -2369,7 +2369,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2384,7 +2384,7 @@ static void dgap_cmdb(struct channel_t *ch, u8 cmd, u8 byte1,
       * Put the data in the circular command buffer.
       */
      writeb(cmd, (vaddr + head + CMDSTART + 0));
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
      writeb(byte1, (vaddr + head + CMDSTART + 2));
      writeb(byte2, (vaddr + head + CMDSTART + 3));
 

@@ -2452,7 +2452,7 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2467,8 +2467,8 @@ static void dgap_cmdw(struct channel_t *ch, u8 cmd, u16 word, uint ncmds)
       * Put the data in the circular command buffer.
       */
      writeb(cmd, (vaddr + head + CMDSTART + 0));
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-     writew((u16) word, (vaddr + head + CMDSTART + 2));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writew((u16)word, (vaddr + head + CMDSTART + 2));
 
      head = (head + 4) & (CMDMAX - CMDSTART - 4);
 

@@ -2534,7 +2534,7 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
      if (!vaddr)
              return;
 
-     cm_addr = (struct cm_t __iomem *) (vaddr + CMDBUF);
+     cm_addr = (struct cm_t __iomem *)(vaddr + CMDBUF);
      head = readw(&(cm_addr->cm_head));
 
      /*

@@ -2550,19 +2550,19 @@ static void dgap_cmdw_ext(struct channel_t *ch, u16 cmd, u16 word, uint ncmds)
       */
 
      /* Write an FF to tell the FEP that we want an extended command */
-     writeb((u8) 0xff, (vaddr + head + CMDSTART + 0));
+     writeb((u8)0xff, (vaddr + head + CMDSTART + 0));
 
-     writeb((u8) ch->ch_portnum, (vaddr + head + CMDSTART + 1));
-     writew((u16) cmd, (vaddr + head + CMDSTART + 2));
+     writeb((u8)ch->ch_portnum, (vaddr + head + CMDSTART + 1));
+     writew((u16)cmd, (vaddr + head + CMDSTART + 2));
 
      /*
       * If the second part of the command won't fit,
       * put it at the beginning of the circular buffer.
       */
      if (((head + 4) >= ((CMDMAX - CMDSTART)) || (head & 03)))
-             writew((u16) word, (vaddr + CMDSTART));
+             writew((u16)word, (vaddr + CMDSTART));
      else
-             writew((u16) word, (vaddr + head + CMDSTART + 4));
+             writew((u16)word, (vaddr + head + CMDSTART + 4));
 
      head = (head + 8) & (CMDMAX - CMDSTART - 4);
 

@@ -2860,13 +2860,13 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              cflag &= 0xffff;
 
              if (cflag != ch->ch_fepcflag) {
-                     ch->ch_fepcflag = (u16) (cflag & 0xffff);
+                     ch->ch_fepcflag = (u16)(cflag & 0xffff);
 
                      /*
                       * Okay to have channel and board
                       * locks held calling this
                       */
-                     dgap_cmdw(ch, SCFLAG, (u16) cflag, 0);
+                     dgap_cmdw(ch, SCFLAG, (u16)cflag, 0);
              }
 
              /* Handle transition from B0 */

@@ -2907,7 +2907,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_fepiflag = iflag;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdw(ch, SIFLAG, (u16) ch->ch_fepiflag, 0);
+             dgap_cmdw(ch, SIFLAG, (u16)ch->ch_fepiflag, 0);
      }
 
      /*

@@ -2932,7 +2932,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_hflow = hflow;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdb(ch, SHFLOW, (u8) hflow, 0xff, 0);
+             dgap_cmdb(ch, SHFLOW, (u8)hflow, 0xff, 0);
      }
 
      /*

@@ -2960,7 +2960,7 @@ static int dgap_param(struct channel_t *ch, struct board_t *bd, u32 un_type)
              ch->ch_mostat = mval;
 
              /* Okay to have channel and board locks held calling this */
-             dgap_cmdb(ch, SMODEM, (u8) mval, D_RTS(ch)|D_DTR(ch), 0);
+             dgap_cmdb(ch, SMODEM, (u8)mval, D_RTS(ch) | D_DTR(ch), 0);
      }
 
      /*

@@ -3159,7 +3159,7 @@ static void dgap_tty_flush_buffer(struct tty_struct *tty)
 
      ch->ch_flags &= ~CH_STOP;
      head = readw(&(ch->ch_bs->tx_head));
-     dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+     dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
      dgap_cmdw(ch, RESUMETX, 0, 0);
      if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
              ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -3604,7 +3604,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
              n -= remain;
              vaddr = ch->ch_taddr + head;
 
-             memcpy_toio(vaddr, (u8 *) buf, remain);
+             memcpy_toio(vaddr, (u8 *)buf, remain);
 
              head = ch->ch_tstart;
              buf += remain;

@@ -3617,7 +3617,7 @@ static int dgap_tty_write(struct tty_struct *tty, const unsigned char *buf,
              vaddr = ch->ch_taddr + head;
              remain = n;
 
-             memcpy_toio(vaddr, (u8 *) buf, remain);
+             memcpy_toio(vaddr, (u8 *)buf, remain);
              head += remain;
      }
 

@@ -3830,7 +3830,7 @@ static int dgap_tty_send_break(struct tty_struct *tty, int msec)
 #if 0
      dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
 #endif
-     dgap_cmdw(ch, SBREAK, (u16) msec, 0);
+     dgap_cmdw(ch, SBREAK, (u16)msec, 0);
 
      spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
      spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4152,7 +4152,7 @@ static int dgap_tty_digisetedelay(struct channel_t *ch, struct board_t *bd,
      spin_lock_irqsave(&bd->bd_lock, lock_flags);
      spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-     writew((u16) new_digi, &(ch->ch_bs->edelay));
+     writew((u16)new_digi, &ch->ch_bs->edelay);
 
      dgap_param(ch, bd, un->un_type);
 

@@ -4759,7 +4759,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
      u16 head;
      ulong lock_flags = 0;
      ulong lock_flags2 = 0;
-     void __user *uarg = (void __user *) arg;
+     void __user *uarg = (void __user *)arg;
 
      if (!tty || tty->magic != TTY_MAGIC)
              return -ENODEV;

@@ -4811,7 +4811,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
              if (((cmd == TCSBRK) && (!arg)) || (cmd == TCSBRKP))
-                     dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+                     dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4838,7 +4838,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&bd->bd_lock, lock_flags);
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-             dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+             dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4865,7 +4865,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_lock_irqsave(&bd->bd_lock, lock_flags);
              spin_lock_irqsave(&ch->ch_lock, lock_flags2);
 
-             dgap_cmdw(ch, SBREAK, (u16) SBREAK_TIME, 0);
+             dgap_cmdw(ch, SBREAK, (u16)SBREAK_TIME, 0);
 
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);

@@ -4889,13 +4889,13 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
              return put_user(C_CLOCAL(tty) ? 1 : 0,
-                             (unsigned long __user *) arg);
+                             (unsigned long __user *)arg);
 
      case TIOCSSOFTCAR:
              spin_unlock_irqrestore(&ch->ch_lock, lock_flags2);
              spin_unlock_irqrestore(&bd->bd_lock, lock_flags);
 
-             rc = get_user(arg, (unsigned long __user *) arg);
+             rc = get_user(arg, (unsigned long __user *)arg);
              if (rc)
                      return rc;
 

@@ -4960,7 +4960,7 @@ static int dgap_tty_ioctl(struct tty_struct *tty, unsigned int cmd,
 
              ch->ch_flags &= ~CH_STOP;
              head = readw(&(ch->ch_bs->tx_head));
-             dgap_cmdw(ch, FLUSHTX, (u16) head, 0);
+             dgap_cmdw(ch, FLUSHTX, (u16)head, 0);
              dgap_cmdw(ch, RESUMETX, 0, 0);
              if (ch->ch_tun.un_flags & (UN_LOW|UN_EMPTY)) {
                      ch->ch_tun.un_flags &= ~(UN_LOW|UN_EMPTY);

@@ -5985,7 +5985,7 @@ static int dgap_test_bios(struct board_t *brd)
      brd->wait_for_bios = 0;
      while (brd->wait_for_bios < 1000) {
              /* Check to see if BIOS thinks board is good. (GD). */
-             if (word == *(u16 *) "GD")
+             if (word == *(u16 *)"GD")
                      return 0;
              msleep_interruptible(10);
              brd->wait_for_bios++;

@@ -6071,12 +6071,12 @@ static int dgap_test_fep(struct board_t *brd)
      brd->wait_for_fep = 0;
      while (brd->wait_for_fep < 500) {
              /* Check to see if FEP is up and running now. */
-             if (word == *(u16 *) "OS") {
+             if (word == *(u16 *)"OS") {
                      /*
                       * Check to see if the board can support FEP5+ commands.
                      */
                      word = readw(addr + FEP5_PLUS);
-                     if (word == *(u16 *) "5A")
+                     if (word == *(u16 *)"5A")
                              brd->bd_flags |= BD_FEP5PLUS;
 
                      return 0;

@@ -6162,8 +6162,8 @@ static void dgap_do_conc_load(struct board_t *brd, u8 *uaddr, int len)
 
      vaddr = brd->re_map_membase;
 
-     offset = readw((u16 *) (vaddr + DOWNREQ));
-     to_dp = (struct downld_t *) (vaddr + (int) offset);
+     offset = readw((u16 *)(vaddr + DOWNREQ));
+     to_dp = (struct downld_t *)(vaddr + (int)offset);
      memcpy_toio(to_dp, uaddr, len);
 
      /* Tell card we have data for it */

@@ -6622,7 +6622,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
       * is requesting a concentrator image from us.
       */
      if ((bd->type == PCX) || (bd->type == PEPC)) {
-             chk_addr = (u16 *) (vaddr + DOWNREQ);
+             chk_addr = (u16 *)(vaddr + DOWNREQ);
              /* Nonzero if FEP is requesting concentrator image. */
              check = readw(chk_addr);
              vaddr = brd->re_map_membase;

@@ -6637,7 +6637,7 @@ static int dgap_firmware_load(struct pci_dev *pdev, int card_type,
                      return ret;
              }
              /* Put concentrator firmware loading code here */
-             offset = readw((u16 *) (vaddr + DOWNREQ));
+             offset = readw((u16 *)(vaddr + DOWNREQ));
              memcpy_toio(offset, fw->data, fw->size);
 
              dgap_do_conc_load(brd, (char *)fw->data, fw->size)

@@ -6720,8 +6720,8 @@ static int dgap_tty_init(struct board_t *brd)
      ch = brd->channels[0];
      vaddr = brd->re_map_membase;
 
-     bs = (struct bs_t __iomem *) ((ulong) vaddr + CHANBUF);
-     cm = (struct cm_t __iomem *) ((ulong) vaddr + CMDBUF);
+     bs = (struct bs_t __iomem *)((ulong)vaddr + CHANBUF);
+     cm = (struct cm_t __iomem *)((ulong)vaddr + CMDBUF);
 
      brd->bd_bs = bs;
 
--

2.1.4

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To post to this group, send email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/d884ca2435043329459e463d282995002ab72e6f.1445382697.git.ciorneiioana%40gmail.com.
For more options, visit https://groups.google.com/d/optout.