Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 228123
b: refs/heads/master
c: 59a1264
h: refs/heads/master
i:
  228121: f4374f8
  228119: de30a16
v: v3
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Nov 16, 2010
1 parent e52fc09 commit 7181093
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 38 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1a26e492c4a90466cb3e064ccf69db4dd66d63a
refs/heads/master: 59a126418b96e9f5337d431e6024a8d50bbd6e4e
2 changes: 0 additions & 2 deletions trunk/drivers/staging/iio/dds/ad9832.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ static void ad9832_init(struct ad9832_state *st)

config = 0x3 << 14;

mutex_lock(&st->lock);

xfer.len = 2;
xfer.tx_buf = &config;

Expand Down
11 changes: 1 addition & 10 deletions trunk/drivers/staging/iio/dds/ad9852.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 3;
xfer.tx_buf = &config->phajst1[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -96,7 +95,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 6;
xfer.tx_buf = &config->fretun1[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -106,7 +104,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 6;
xfer.tx_buf = &config->fretun2[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -116,7 +113,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 6;
xfer.tx_buf = &config->dltafre[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -126,7 +122,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->updtclk[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -136,7 +131,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 4;
xfer.tx_buf = &config->ramprat[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -146,7 +140,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->control[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -156,7 +149,6 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 3;
xfer.tx_buf = &config->outpskm[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -166,16 +158,15 @@ static ssize_t ad9852_set_parameter(struct device *dev,

xfer.len = 2;
xfer.tx_buf = &config->outpskr[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 3;
xfer.tx_buf = &config->daccntl[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand Down
26 changes: 6 additions & 20 deletions trunk/drivers/staging/iio/dds/ad9910.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->ioupd[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -148,7 +147,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->ftw[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -158,7 +156,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 3;
xfer.tx_buf = &config->pow[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -168,7 +165,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->asf[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -178,7 +174,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->multc[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -188,7 +183,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 9;
xfer.tx_buf = &config->dig_rampl[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -198,7 +192,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 9;
xfer.tx_buf = &config->dig_ramps[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -208,7 +201,6 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->dig_rampr[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -218,25 +210,24 @@ static ssize_t ad9910_set_parameter(struct device *dev,

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep0[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep1[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep2[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -245,43 +236,42 @@ static ssize_t ad9910_set_parameter(struct device *dev,
goto error_ret;
xfer.len = 9;
xfer.tx_buf = &config->sin_tonep3[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep4[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep5[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep6[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->sdev, &msg);
if (ret)
goto error_ret;

xfer.len = 9;
xfer.tx_buf = &config->sin_tonep7[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand Down Expand Up @@ -326,8 +316,6 @@ static void ad9910_init(struct ad9910_state *st)
cfr[3] = TX_ENA | PDCLK_INV | PDCLK_ENB;
cfr[4] = PARA_ENA;

mutex_lock(&st->lock);

xfer.len = 5;
xfer.tx_buf = &cfr;

Expand All @@ -343,8 +331,6 @@ static void ad9910_init(struct ad9910_state *st)
cfr[3] = REFCLK_RST | REFCLK_BYP;
cfr[4] = 0;

mutex_lock(&st->lock);

xfer.len = 5;
xfer.tx_buf = &cfr;

Expand Down
5 changes: 0 additions & 5 deletions trunk/drivers/staging/iio/dds/ad9951.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ static ssize_t ad9951_set_parameter(struct device *dev,

xfer.len = 2;
xfer.tx_buf = &config->arr[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -89,7 +88,6 @@ static ssize_t ad9951_set_parameter(struct device *dev,

xfer.len = 5;
xfer.tx_buf = &config->ftw0[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand All @@ -99,7 +97,6 @@ static ssize_t ad9951_set_parameter(struct device *dev,

xfer.len = 3;
xfer.tx_buf = &config->ftw1[0];
mutex_lock(&st->lock);

spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
Expand Down Expand Up @@ -143,8 +140,6 @@ static void ad9951_init(struct ad9951_state *st)
cfr[2] = HSPD_SYNC;
cfr[3] = 0;

mutex_lock(&st->lock);

xfer.len = 4;
xfer.tx_buf = &cfr;

Expand Down

0 comments on commit 7181093

Please sign in to comment.