Commit 2cee5dfa authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds

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: default avatarAdrian Bunk <bunk@kernel.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e4d33969
...@@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi) ...@@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
no_multi = 1; no_multi = 1;
break; break;
} }
min = BCD2BIN(buffer[15]); min = bcd2bin(buffer[15]);
sec = BCD2BIN(buffer[16]); sec = bcd2bin(buffer[16]);
frame = BCD2BIN(buffer[17]); frame = bcd2bin(buffer[17]);
sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
break; break;
} }
...@@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi) ...@@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
} }
if (rc != 0) if (rc != 0)
break; break;
min = BCD2BIN(buffer[1]); min = bcd2bin(buffer[1]);
sec = BCD2BIN(buffer[2]); sec = bcd2bin(buffer[2]);
frame = BCD2BIN(buffer[3]); frame = bcd2bin(buffer[3]);
sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
if (sector) if (sector)
sector -= CD_MSF_OFFSET; sector -= CD_MSF_OFFSET;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment