drivers/scsi/sr_vendor.c: use bcd2bin (2cee5dfa) · Commits · 戴 / test

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:

drivers/scsi/sr_vendor.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -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;