2014-07-20 14:06:51

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 1/7] Staging: comedi: adv_pci1710: a line over 80 fixed

A 'line over 80' issue fixed, by removing comment to previous line. And
also, by this, 'a blank line' isssue resolved.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 602b7a1..a15a552 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -722,8 +722,8 @@ static int pci171x_ai_cancel(struct comedi_device *dev,
default:
devpriv->CntrlReg &= Control_CNT0;
devpriv->CntrlReg |= Control_SW;
-
- outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL); /* reset any operations */
+ /* reset any operations */
+ outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
pci171x_start_pacer(dev, false);
outb(0, dev->iobase + PCI171x_CLRFIFO);
outb(0, dev->iobase + PCI171x_CLRINT);
--
1.7.10.4


2014-07-20 14:06:54

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 4/7] Staging: comedi: adv_pci1710: a line over 80 characters fixed

An issue in 'line over 80 characters' fixed and over-lined comment
removed to the previous line.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 887aa7e..bc73141 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1058,7 +1058,8 @@ static int pci171x_reset(struct comedi_device *dev)
pci171x_start_pacer(dev, false);
devpriv->da_ranges = 0;
if (this_board->n_aochan) {
- outb(devpriv->da_ranges, dev->iobase + PCI171x_DAREF); /* set DACs to 0..5V */
+ /* set DACs to 0..5V */
+ outb(devpriv->da_ranges, dev->iobase + PCI171x_DAREF);
outw(0, dev->iobase + PCI171x_DA1); /* set DA outputs to 0V */
devpriv->ao_data[0] = 0x0000;
if (this_board->n_aochan > 1) {
--
1.7.10.4

2014-07-20 14:07:25

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 2/7] Staging: comedi: adv_pci1710: a line over 80 issue fixed

By removing a comment to previous line, 'line over 80' issue
fixed.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index a15a552..b4b8f85 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1049,7 +1049,8 @@ static int pci171x_reset(struct comedi_device *dev)
struct pci1710_private *devpriv = dev->private;

outw(0x30, dev->iobase + PCI171x_CNTCTRL);
- devpriv->CntrlReg = Control_SW | Control_CNT0; /* Software trigger, CNT0=external */
+ /* Software trigger, CNT0=external */
+ devpriv->CntrlReg = Control_SW | Control_CNT0;
outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL); /* reset any operations */
outb(0, dev->iobase + PCI171x_CLRFIFO); /* clear FIFO */
outb(0, dev->iobase + PCI171x_CLRINT); /* clear INT request */
--
1.7.10.4

2014-07-20 14:07:49

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 7/7] Staging: comedi: adv_pci1710: an issue in code style fixed

An issue in 'line over 80 characters' fixed by removing over-lined
comment to the previous line.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 6bd5015..e19ab95 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1083,7 +1083,8 @@ static int pci1720_reset(struct comedi_device *dev)
/* set synchronous output mode */
outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT);
devpriv->da_ranges = 0xAA;
- outb(devpriv->da_ranges, dev->iobase + PCI1720_RANGE); /* set all ranges to +/-5V */
+ /* set all ranges to +/-5V */
+ outb(devpriv->da_ranges, dev->iobase + PCI1720_RANGE);
outw(0x0800, dev->iobase + PCI1720_DA0); /* set outputs to 0V */
outw(0x0800, dev->iobase + PCI1720_DA1);
outw(0x0800, dev->iobase + PCI1720_DA2);
--
1.7.10.4

2014-07-20 14:06:49

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 3/7] Staging: comedi: adv_pci1710: A line style issue fixed

A 'line over 80 characters' fixed by removing over-lined comment
to previous line.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index b4b8f85..887aa7e 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1051,7 +1051,8 @@ static int pci171x_reset(struct comedi_device *dev)
outw(0x30, dev->iobase + PCI171x_CNTCTRL);
/* Software trigger, CNT0=external */
devpriv->CntrlReg = Control_SW | Control_CNT0;
- outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL); /* reset any operations */
+ /* reset any operations */
+ outw(devpriv->CntrlReg, dev->iobase + PCI171x_CONTROL);
outb(0, dev->iobase + PCI171x_CLRFIFO); /* clear FIFO */
outb(0, dev->iobase + PCI171x_CLRINT); /* clear INT request */
pci171x_start_pacer(dev, false);
--
1.7.10.4

2014-07-20 14:08:15

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 5/7] Staging: comedi: adv_pci1710: a line over 80 characters resolved

An issue in 'line over 80 characters' fixed by taking back over-lined comment
a few characters.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index bc73141..7ccd41b 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1060,7 +1060,7 @@ static int pci171x_reset(struct comedi_device *dev)
if (this_board->n_aochan) {
/* set DACs to 0..5V */
outb(devpriv->da_ranges, dev->iobase + PCI171x_DAREF);
- outw(0, dev->iobase + PCI171x_DA1); /* set DA outputs to 0V */
+ outw(0, dev->iobase + PCI171x_DA1); /* set DA outputs to 0V */
devpriv->ao_data[0] = 0x0000;
if (this_board->n_aochan > 1) {
outw(0, dev->iobase + PCI171x_DA2);
--
1.7.10.4

2014-07-20 14:08:34

by Sam Asadi

[permalink] [raw]
Subject: [PATCH 6/7] Staging: comedi: adv_pci1710: an issue in line over 80 fixed

An issue in 'line over 80 characters' fixed by removing over-lined comment
to the previous line.

Signed-off-by: Sam Asadi <[email protected]>
---
drivers/staging/comedi/drivers/adv_pci1710.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/comedi/drivers/adv_pci1710.c b/drivers/staging/comedi/drivers/adv_pci1710.c
index 7ccd41b..6bd5015 100644
--- a/drivers/staging/comedi/drivers/adv_pci1710.c
+++ b/drivers/staging/comedi/drivers/adv_pci1710.c
@@ -1080,8 +1080,8 @@ static int pci171x_reset(struct comedi_device *dev)
static int pci1720_reset(struct comedi_device *dev)
{
struct pci1710_private *devpriv = dev->private;
-
- outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT); /* set synchronous output mode */
+ /* set synchronous output mode */
+ outb(Syncont_SC0, dev->iobase + PCI1720_SYNCONT);
devpriv->da_ranges = 0xAA;
outb(devpriv->da_ranges, dev->iobase + PCI1720_RANGE); /* set all ranges to +/-5V */
outw(0x0800, dev->iobase + PCI1720_DA0); /* set outputs to 0V */
--
1.7.10.4