Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2cee5dfa8b01524a1d937d56ee518677b7acfb38

Authored by Adrian Bunk
Committed by Linus Torvalds
1 parent e4d33969c2
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

drivers/scsi/sr_vendor.c: use bcd2bin 

Change sr_vendor.c to use the new bcd2bin function instead of the obsolete
BCD2BIN macro.

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 6 additions and 6 deletions Side-by-side Diff

drivers/scsi/sr_vendor.c
Diff comments   View file @ 2cee5df
... ... @@ -223,9 +223,9 @@
223 223 no_multi = 1;
224 224 break;
225 225 }
226   - min = BCD2BIN(buffer[15]);
227   - sec = BCD2BIN(buffer[16]);
228   - frame = BCD2BIN(buffer[17]);
  226 + min = bcd2bin(buffer[15]);
  227 + sec = bcd2bin(buffer[16]);
  228 + frame = bcd2bin(buffer[17]);
229 229 sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
230 230 break;
231 231 }
... ... @@ -252,9 +252,9 @@
252 252 }
253 253 if (rc != 0)
254 254 break;
255   - min = BCD2BIN(buffer[1]);
256   - sec = BCD2BIN(buffer[2]);
257   - frame = BCD2BIN(buffer[3]);
  255 + min = bcd2bin(buffer[1]);
  256 + sec = bcd2bin(buffer[2]);
  257 + frame = bcd2bin(buffer[3]);
258 258 sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
259 259 if (sector)
260 260 sector -= CD_MSF_OFFSET;