mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 01:10:04 +00:00
ide: cleanup ide_disk_init_mult_count()
* Remove superfluous checks for drive->mult_req. * No need to zero drive's fields. * Move the common code out of #ifdef scope. There should be no functional changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
f8881000d7
commit
df1f8378c2
1 changed files with 10 additions and 11 deletions
|
@ -89,20 +89,19 @@ static void ide_disk_init_mult_count(ide_drive_t *drive)
|
|||
{
|
||||
struct hd_driveid *id = drive->id;
|
||||
|
||||
drive->mult_count = 0;
|
||||
if (id->max_multsect) {
|
||||
#ifdef CONFIG_IDEDISK_MULTI_MODE
|
||||
id->multsect = ((id->max_multsect/2) > 1) ? id->max_multsect : 0;
|
||||
id->multsect_valid = id->multsect ? 1 : 0;
|
||||
drive->mult_req = id->multsect_valid ? id->max_multsect : 0;
|
||||
drive->special.b.set_multmode = drive->mult_req ? 1 : 0;
|
||||
#else /* original, pre IDE-NFG, per request of AC */
|
||||
drive->mult_req = 0;
|
||||
if (drive->mult_req > id->max_multsect)
|
||||
drive->mult_req = id->max_multsect;
|
||||
if (drive->mult_req || ((id->multsect_valid & 1) && id->multsect))
|
||||
drive->special.b.set_multmode = 1;
|
||||
if ((id->max_multsect / 2) > 1) {
|
||||
id->multsect = id->max_multsect;
|
||||
id->multsect_valid = 1;
|
||||
} else {
|
||||
id->multsect = 0;
|
||||
id->multsect_valid = 0;
|
||||
}
|
||||
drive->mult_req = id->multsect;
|
||||
#endif
|
||||
if ((id->multsect_valid & 1) && id->multsect)
|
||||
drive->special.b.set_multmode = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue