ide: move ide_pio_cycle_time() to ide-timings.c
All ide_pio_cycle_time() users already select CONFIG_IDE_TIMINGS so move the function from ide-lib.c to ide-timings.c. While at it: - convert ide_pio_cycle_time() to use ide_timing_find_mode() - cleanup ide_pio_cycle_time() a bit There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
8a97206e31
commit
c9d6c1a237
|
@ -188,29 +188,6 @@ static int ide_scan_pio_blacklist (char *model)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int ide_pio_cycle_time(ide_drive_t *drive, u8 pio)
|
|
||||||
{
|
|
||||||
struct hd_driveid *id = drive->id;
|
|
||||||
int cycle_time = 0;
|
|
||||||
|
|
||||||
if (id->field_valid & 2) {
|
|
||||||
if (id->capability & 8)
|
|
||||||
cycle_time = id->eide_pio_iordy;
|
|
||||||
else
|
|
||||||
cycle_time = id->eide_pio;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* conservative "downgrade" for all pre-ATA2 drives */
|
|
||||||
if (pio < 3) {
|
|
||||||
if (cycle_time && cycle_time < ide_pio_timings[pio].cycle_time)
|
|
||||||
cycle_time = 0; /* use standard timing */
|
|
||||||
}
|
|
||||||
|
|
||||||
return cycle_time ? cycle_time : ide_pio_timings[pio].cycle_time;
|
|
||||||
}
|
|
||||||
|
|
||||||
EXPORT_SYMBOL_GPL(ide_pio_cycle_time);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ide_get_best_pio_mode - get PIO mode from drive
|
* ide_get_best_pio_mode - get PIO mode from drive
|
||||||
* @drive: drive to consider
|
* @drive: drive to consider
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 1999-2001 Vojtech Pavlik
|
* Copyright (c) 1999-2001 Vojtech Pavlik
|
||||||
|
* Copyright (c) 2007-2008 Bartlomiej Zolnierkiewicz
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* This program is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -75,6 +76,27 @@ struct ide_timing *ide_timing_find_mode(u8 speed)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(ide_timing_find_mode);
|
EXPORT_SYMBOL_GPL(ide_timing_find_mode);
|
||||||
|
|
||||||
|
u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)
|
||||||
|
{
|
||||||
|
struct hd_driveid *id = drive->id;
|
||||||
|
struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);
|
||||||
|
u16 cycle = 0;
|
||||||
|
|
||||||
|
if (id->field_valid & 2) {
|
||||||
|
if (id->capability & 8)
|
||||||
|
cycle = id->eide_pio_iordy;
|
||||||
|
else
|
||||||
|
cycle = id->eide_pio;
|
||||||
|
|
||||||
|
/* conservative "downgrade" for all pre-ATA2 drives */
|
||||||
|
if (pio < 3 && cycle < t->cycle)
|
||||||
|
cycle = 0; /* use standard timing */
|
||||||
|
}
|
||||||
|
|
||||||
|
return cycle ? cycle : t->cycle;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(ide_pio_cycle_time);
|
||||||
|
|
||||||
#define ENOUGH(v, unit) (((v) - 1) / (unit) + 1)
|
#define ENOUGH(v, unit) (((v) - 1) / (unit) + 1)
|
||||||
#define EZ(v, unit) ((v) ? ENOUGH(v, unit) : 0)
|
#define EZ(v, unit) ((v) ? ENOUGH(v, unit) : 0)
|
||||||
|
|
||||||
|
|
|
@ -1300,6 +1300,7 @@ enum {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct ide_timing *ide_timing_find_mode(u8);
|
struct ide_timing *ide_timing_find_mode(u8);
|
||||||
|
u16 ide_pio_cycle_time(ide_drive_t *, u8);
|
||||||
void ide_timing_merge(struct ide_timing *, struct ide_timing *,
|
void ide_timing_merge(struct ide_timing *, struct ide_timing *,
|
||||||
struct ide_timing *, unsigned int);
|
struct ide_timing *, unsigned int);
|
||||||
int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
|
int ide_timing_compute(ide_drive_t *, u8, struct ide_timing *, int, int);
|
||||||
|
@ -1311,7 +1312,6 @@ typedef struct ide_pio_timings_s {
|
||||||
/* active + recovery (+ setup for some chips) */
|
/* active + recovery (+ setup for some chips) */
|
||||||
} ide_pio_timings_t;
|
} ide_pio_timings_t;
|
||||||
|
|
||||||
unsigned int ide_pio_cycle_time(ide_drive_t *, u8);
|
|
||||||
u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
|
u8 ide_get_best_pio_mode(ide_drive_t *, u8, u8);
|
||||||
extern const ide_pio_timings_t ide_pio_timings[6];
|
extern const ide_pio_timings_t ide_pio_timings[6];
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue