diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-10-18 23:28:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-20 11:52:41 -0400 |
| commit | 2cee5dfa8b01524a1d937d56ee518677b7acfb38 (patch) | |
| tree | 3d8d34fc2fd173eee43ccb1cdc01a3325c9acb65 | |
| parent | e4d33969c2d0a9b92c7a2853e3f890dcb4ea37d1 (diff) | |
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>
| -rw-r--r-- | drivers/scsi/sr_vendor.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c index 4eb3da996b36..4ad3e017213f 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c | |||
| @@ -223,9 +223,9 @@ int sr_cd_check(struct cdrom_device_info *cdi) | |||
| 223 | no_multi = 1; | 223 | no_multi = 1; |
| 224 | break; | 224 | break; |
| 225 | } | 225 | } |
| 226 | min = BCD2BIN(buffer[15]); | 226 | min = bcd2bin(buffer[15]); |
| 227 | sec = BCD2BIN(buffer[16]); | 227 | sec = bcd2bin(buffer[16]); |
| 228 | frame = BCD2BIN(buffer[17]); | 228 | frame = bcd2bin(buffer[17]); |
| 229 | sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; | 229 | sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; |
| 230 | break; | 230 | break; |
| 231 | } | 231 | } |
| @@ -252,9 +252,9 @@ int sr_cd_check(struct cdrom_device_info *cdi) | |||
| 252 | } | 252 | } |
| 253 | if (rc != 0) | 253 | if (rc != 0) |
| 254 | break; | 254 | break; |
| 255 | min = BCD2BIN(buffer[1]); | 255 | min = bcd2bin(buffer[1]); |
| 256 | sec = BCD2BIN(buffer[2]); | 256 | sec = bcd2bin(buffer[2]); |
| 257 | frame = BCD2BIN(buffer[3]); | 257 | frame = bcd2bin(buffer[3]); |
| 258 | sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; | 258 | sector = min * CD_SECS * CD_FRAMES + sec * CD_FRAMES + frame; |
| 259 | if (sector) | 259 | if (sector) |
| 260 | sector -= CD_MSF_OFFSET; | 260 | sector -= CD_MSF_OFFSET; |