forked from Minki/linux
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>
This commit is contained in:
parent
e4d33969c2
commit
2cee5dfa8b
@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
|
||||
no_multi = 1;
|
||||
break;
|
||||
}
|
||||
min = BCD2BIN(buffer[15]);
|
||||
sec = BCD2BIN(buffer[16]);
|
||||
frame = BCD2BIN(buffer[17]);
|
||||
min = bcd2bin(buffer[15]);
|
||||
sec = bcd2bin(buffer[16]);
|
||||
frame = bcd2bin(buffer[17]);
|
||||
sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
|
||||
break;
|
||||
}
|
||||
@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi)
|
||||
}
|
||||
if (rc != 0)
|
||||
break;
|
||||
min = BCD2BIN(buffer[1]);
|
||||
sec = BCD2BIN(buffer[2]);
|
||||
frame = BCD2BIN(buffer[3]);
|
||||
min = bcd2bin(buffer[1]);
|
||||
sec = bcd2bin(buffer[2]);
|
||||
frame = bcd2bin(buffer[3]);
|
||||
sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame;
|
||||
if (sector)
|
||||
sector -= CD_MSF_OFFSET;
|
||||
|
Loading…
Reference in New Issue
Block a user