Skip to content

Commit cefe9cc

Browse files
nunojsanunojsa
committed
iio: adc: move strtobool() to kstrtobool()
strtobool() will be removed in 6.12. Hence let's do now the transition. Signed-off-by: Nuno Sá <nuno.sa@analog.com>
1 parent b0d67b6 commit cefe9cc

File tree

8 files changed

+39
-39
lines changed

8 files changed

+39
-39
lines changed

‎drivers/iio/adc/ad9081.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,7 +1437,7 @@ static ssize_t ad9081_ext_info_write(struct iio_dev *indio_dev,
14371437
phy->dac_cache.chan_gain[fddc_num] = readin_32;
14381438
break;
14391439
case CDDC_6DB_GAIN:
1440-
ret = strtobool(buf, &enable);
1440+
ret = kstrtobool(buf, &enable);
14411441
if (ret)
14421442
return ret;
14431443

@@ -1449,7 +1449,7 @@ static ssize_t ad9081_ext_info_write(struct iio_dev *indio_dev,
14491449
ret = 0;
14501450
break;
14511451
case FDDC_6DB_GAIN:
1452-
ret = strtobool(buf, &enable);
1452+
ret = kstrtobool(buf, &enable);
14531453
if (ret)
14541454
return ret;
14551455
ret = adi_ad9081_adc_ddc_fine_gain_set(
@@ -1460,7 +1460,7 @@ static ssize_t ad9081_ext_info_write(struct iio_dev *indio_dev,
14601460
ret = 0;
14611461
break;
14621462
case DAC_MAIN_TEST_TONE_EN:
1463-
ret = strtobool(buf, &enable);
1463+
ret = kstrtobool(buf, &enable);
14641464
if (ret)
14651465
return ret;
14661466

@@ -1470,7 +1470,7 @@ static ssize_t ad9081_ext_info_write(struct iio_dev *indio_dev,
14701470
phy->dac_cache.main_test_tone_en[fddc_num] = enable;
14711471
break;
14721472
case DAC_CHAN_TEST_TONE_EN:
1473-
ret = strtobool(buf, &enable);
1473+
ret = kstrtobool(buf, &enable);
14741474
if (ret)
14751475
return ret;
14761476

@@ -1570,7 +1570,7 @@ static ssize_t ad9081_ext_info_write(struct iio_dev *indio_dev,
15701570
ret = -EOPNOTSUPP;
15711571
break;
15721572
}
1573-
ret = strtobool(buf, &enable);
1573+
ret = kstrtobool(buf, &enable);
15741574
if (ret)
15751575
return ret;
15761576

@@ -2720,7 +2720,7 @@ static ssize_t ad9081_phy_store(struct device *dev,
27202720
break;
27212721
}
27222722

2723-
ret = strtobool(buf, &bres);
2723+
ret = kstrtobool(buf, &bres);
27242724
if (ret < 0) {
27252725
ret = -EINVAL;
27262726
break;
@@ -2756,7 +2756,7 @@ static ssize_t ad9081_phy_store(struct device *dev,
27562756
break;
27572757
}
27582758

2759-
ret = strtobool(buf, &enable);
2759+
ret = kstrtobool(buf, &enable);
27602760
if (ret)
27612761
break;
27622762

@@ -2774,7 +2774,7 @@ static ssize_t ad9081_phy_store(struct device *dev,
27742774

27752775
break;
27762776
case AD9081_POWER_DOWN:
2777-
ret = strtobool(buf, &enable);
2777+
ret = kstrtobool(buf, &enable);
27782778
if (ret)
27792779
break;
27802780
ret = ad9081_set_power_state(phy, !enable);

‎drivers/iio/adc/ad9083.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,7 @@ static ssize_t ad9083_phy_store(struct device *dev,
465465
break;
466466
}
467467

468-
ret = strtobool(buf, &enable);
468+
ret = kstrtobool(buf, &enable);
469469
if (ret)
470470
break;
471471

‎drivers/iio/adc/ad9208.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ static ssize_t ad9208_ext_info_write(struct iio_dev *indio_dev,
533533
bool enable;
534534
int ret;
535535

536-
ret = strtobool(buf, &enable);
536+
ret = kstrtobool(buf, &enable);
537537
if (ret)
538538
return ret;
539539

‎drivers/iio/adc/ad9361.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6879,7 +6879,7 @@ static ssize_t ad9361_phy_store(struct device *dev,
68796879
ret = -EINVAL;
68806880
break;
68816881
case AD9361_FIR_TRX_ENABLE:
6882-
ret = strtobool(buf, &res);
6882+
ret = kstrtobool(buf, &res);
68836883
if (ret < 0)
68846884
break;
68856885

@@ -6897,7 +6897,7 @@ static ssize_t ad9361_phy_store(struct device *dev,
68976897

68986898
break;
68996899
case AD9361_FIR_RX_ENABLE:
6900-
ret = strtobool(buf, &res);
6900+
ret = kstrtobool(buf, &res);
69016901
if (ret < 0)
69026902
break;
69036903

@@ -6913,7 +6913,7 @@ static ssize_t ad9361_phy_store(struct device *dev,
69136913

69146914
break;
69156915
case AD9361_FIR_TX_ENABLE:
6916-
ret = strtobool(buf, &res);
6916+
ret = kstrtobool(buf, &res);
69176917
if (ret < 0)
69186918
break;
69196919

@@ -6998,21 +6998,21 @@ static ssize_t ad9361_phy_store(struct device *dev,
69986998
ret = -EINVAL;
69996999
break;
70007000
case AD9361_BBDC_OFFS_ENABLE:
7001-
ret = strtobool(buf, &st->bbdc_track_en);
7001+
ret = kstrtobool(buf, &st->bbdc_track_en);
70027002
if (ret < 0)
70037003
break;
70047004
ret = ad9361_tracking_control(phy, st->bbdc_track_en,
70057005
st->rfdc_track_en, st->quad_track_en);
70067006
break;
70077007
case AD9361_RFDC_OFFS_ENABLE:
7008-
ret = strtobool(buf, &st->rfdc_track_en);
7008+
ret = kstrtobool(buf, &st->rfdc_track_en);
70097009
if (ret < 0)
70107010
break;
70117011
ret = ad9361_tracking_control(phy, st->bbdc_track_en,
70127012
st->rfdc_track_en, st->quad_track_en);
70137013
break;
70147014
case AD9361_QUAD_ENABLE:
7015-
ret = strtobool(buf, &st->quad_track_en);
7015+
ret = kstrtobool(buf, &st->quad_track_en);
70167016
if (ret < 0)
70177017
break;
70187018
ret = ad9361_tracking_control(phy, st->bbdc_track_en,
@@ -7432,7 +7432,7 @@ static ssize_t ad9361_phy_lo_write(struct iio_dev *indio_dev,
74327432
break;
74337433
case LOEXT_EXTERNAL:
74347434
case LOEXT_PD:
7435-
ret = strtobool(buf, &res);
7435+
ret = kstrtobool(buf, &res);
74367436
if (ret < 0)
74377437
return ret;
74387438
break;

‎drivers/iio/adc/ad9371.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1185,7 +1185,7 @@ static ssize_t ad9371_phy_store(struct device *dev,
11851185
ret = ad9371_set_radio_state(phy, val);
11861186
break;
11871187
case AD9371_INIT_CAL:
1188-
ret = strtobool(buf, &enable);
1188+
ret = kstrtobool(buf, &enable);
11891189
if (ret)
11901190
break;
11911191

@@ -1210,7 +1210,7 @@ static ssize_t ad9371_phy_store(struct device *dev,
12101210
}
12111211
break;
12121212
case AD9371_LARGE_LO_STEP_CAL:
1213-
ret = strtobool(buf, &phy->large_freq_step_cal_en);
1213+
ret = kstrtobool(buf, &phy->large_freq_step_cal_en);
12141214
break;
12151215
default:
12161216
ret = -EINVAL;
@@ -1625,7 +1625,7 @@ static ssize_t ad9371_phy_rx_write(struct iio_dev *indio_dev,
16251625

16261626
break;
16271627
case RX_QEC:
1628-
ret = strtobool(buf, &enable);
1628+
ret = kstrtobool(buf, &enable);
16291629

16301630
switch (chan->channel) {
16311631
case CHAN_RX1:
@@ -2007,7 +2007,7 @@ static ssize_t ad9371_phy_tx_write(struct iio_dev *indio_dev,
20072007
case TX_DPD:
20082008
case TX_CLGC:
20092009
case TX_VSWR:
2010-
ret = strtobool(buf, &enable);
2010+
ret = kstrtobool(buf, &enable);
20112011
if (ret)
20122012
break;
20132013

@@ -2026,7 +2026,7 @@ static ssize_t ad9371_phy_tx_write(struct iio_dev *indio_dev,
20262026

20272027
break;
20282028
case TX_DPD_ACT_EN:
2029-
ret = strtobool(buf, &enable);
2029+
ret = kstrtobool(buf, &enable);
20302030
if (ret)
20312031
break;
20322032

‎drivers/iio/adc/admc_ctrl.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
217217
mutex_lock(&st->lock);
218218
switch ((u32)this_attr->address) {
219219
case MC_RUN:
220-
ret = strtobool(buf, &setting);
220+
ret = kstrtobool(buf, &setting);
221221
if (ret < 0)
222222
break;
223223
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -226,7 +226,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
226226
axiadc_write(st, MC_REG_CONTROL, reg_val);
227227
break;
228228
case MC_RESET_OVR_CURR:
229-
ret = strtobool(buf, &setting);
229+
ret = kstrtobool(buf, &setting);
230230
if (ret < 0)
231231
break;
232232
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -235,7 +235,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
235235
axiadc_write(st, MC_REG_CONTROL, reg_val);
236236
break;
237237
case MC_BREAK:
238-
ret = strtobool(buf, &setting);
238+
ret = kstrtobool(buf, &setting);
239239
if (ret < 0)
240240
break;
241241
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -244,7 +244,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
244244
axiadc_write(st, MC_REG_CONTROL, reg_val);
245245
break;
246246
case MC_DIRECTION:
247-
ret = strtobool(buf, &setting);
247+
ret = kstrtobool(buf, &setting);
248248
if (ret < 0)
249249
break;
250250
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -253,7 +253,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
253253
axiadc_write(st, MC_REG_CONTROL, reg_val);
254254
break;
255255
case MC_DELTA:
256-
ret = strtobool(buf, &setting);
256+
ret = kstrtobool(buf, &setting);
257257
if (ret < 0)
258258
break;
259259
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -276,7 +276,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
276276
axiadc_write(st, MC_REG_CONTROL, reg_val);
277277
break;
278278
case MC_MATLAB:
279-
ret = strtobool(buf, &setting);
279+
ret = kstrtobool(buf, &setting);
280280
if (ret < 0)
281281
break;
282282
reg_val = axiadc_read(st, MC_REG_CONTROL);
@@ -285,7 +285,7 @@ static ssize_t mc_ctrl_store(struct device *dev,
285285
axiadc_write(st, MC_REG_CONTROL, reg_val);
286286
break;
287287
case MC_CALIB_ADC:
288-
ret = strtobool(buf, &setting);
288+
ret = kstrtobool(buf, &setting);
289289
if (ret < 0)
290290
break;
291291
reg_val = axiadc_read(st, MC_REG_CONTROL);

‎drivers/iio/adc/adrv9009.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1511,7 +1511,7 @@ static ssize_t adrv9009_phy_store(struct device *dev,
15111511
return -EBUSY;
15121512
}
15131513

1514-
ret = strtobool(buf, &enable);
1514+
ret = kstrtobool(buf, &enable);
15151515
if (ret)
15161516
break;
15171517

@@ -1574,7 +1574,7 @@ static ssize_t adrv9009_phy_store(struct device *dev,
15741574
break;
15751575
}
15761576

1577-
ret = strtobool(buf, &enable);
1577+
ret = kstrtobool(buf, &enable);
15781578
if (ret)
15791579
break;
15801580

@@ -1595,7 +1595,7 @@ static ssize_t adrv9009_phy_store(struct device *dev,
15951595
return -EBUSY;
15961596
}
15971597

1598-
ret = strtobool(buf, &enable);
1598+
ret = kstrtobool(buf, &enable);
15991599
if (ret)
16001600
break;
16011601
ret = TALISE_setRadioCtlPinMode(phy->talDevice,
@@ -1958,7 +1958,7 @@ static ssize_t adrv9009_phy_lo_write(struct iio_dev *indio_dev,
19581958
adrv9009_set_radio_state(phy, RADIO_RESTORE_STATE);
19591959
break;
19601960
case FHM_ENABLE:
1961-
ret = strtobool(buf, &enable);
1961+
ret = kstrtobool(buf, &enable);
19621962
if (ret)
19631963
return ret;
19641964

@@ -2165,7 +2165,7 @@ static ssize_t adrv9009_phy_rx_write(struct iio_dev *indio_dev,
21652165
if (!phy->is_initialized)
21662166
return -EBUSY;
21672167

2168-
ret = strtobool(buf, &enable);
2168+
ret = kstrtobool(buf, &enable);
21692169
if (ret)
21702170
return ret;
21712171

@@ -2627,7 +2627,7 @@ static ssize_t adrv9009_phy_tx_write(struct iio_dev *indio_dev,
26272627
if (chan->channel > CHAN_TX2)
26282628
return -EINVAL;
26292629

2630-
ret = strtobool(buf, &enable);
2630+
ret = kstrtobool(buf, &enable);
26312631
if (ret)
26322632
return ret;
26332633

‎drivers/iio/adc/adrv902x/adrv9025.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ static ssize_t adrv9025_phy_store(struct device *dev,
327327

328328
switch ((u32)this_attr->address & 0xFF) {
329329
case ADRV9025_INIT_CAL:
330-
ret = strtobool(buf, &enable);
330+
ret = kstrtobool(buf, &enable);
331331
if (ret)
332332
break;
333333

@@ -375,7 +375,7 @@ static ssize_t adrv9025_phy_store(struct device *dev,
375375
break;
376376
}
377377

378-
ret = strtobool(buf, &enable);
378+
ret = kstrtobool(buf, &enable);
379379
if (ret)
380380
break;
381381

@@ -752,7 +752,7 @@ static ssize_t adrv9025_phy_rx_write(struct iio_dev *indio_dev,
752752
u64 mask;
753753
u16 mask16;
754754

755-
ret = strtobool(buf, &enable);
755+
ret = kstrtobool(buf, &enable);
756756
if (ret)
757757
return ret;
758758

@@ -930,7 +930,7 @@ static ssize_t adrv9025_phy_tx_write(struct iio_dev *indio_dev,
930930
if (chan->channel > CHAN_TX4)
931931
return -EINVAL;
932932

933-
ret = strtobool(buf, &enable);
933+
ret = kstrtobool(buf, &enable);
934934
if (ret)
935935
return ret;
936936

0 commit comments

Comments
 (0)