lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drivers/scsi/sr_vendor.c: use bcd2bin

Browse Source 
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>
This commit is contained in:
Adrian Bunk
2008-10-18 20:28:47 -07:00
committed by Linus Torvalds
parent e4d33969c2
commit 2cee5dfa8b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/sr_vendor.c
View File

@@ -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)
} }
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;