Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c139e7a authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: checkpatch.pl fixes for ide-timing.h 



Also fix placement of comments in ide_timing_compute() while at it.

There should be no functional changes caused by this patch
(md5sum was verified to be the same before/after the patch).

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bd887f72

drivers/ide/ide-timing.h

+48 −45
Original line number Diff line number Diff line
@@ -3,9 +3,7 @@ 


/*

 *  Copyright (c) 1999-2001 Vojtech Pavlik

 */



/*

 *

 * 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

 * the Free Software Foundation; either version 2 of the License, or
@@ -70,7 +68,8 @@ static struct ide_timing ide_timing[] = { 
#define ENOUGH(v, unit)		(((v) - 1) / (unit) + 1)

#define EZ(v, unit)		((v) ? ENOUGH(v, unit) : 0)



static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, int T, int UT)

static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q,

				int T, int UT)

{

	q->setup   = EZ(t->setup   * 1000,  T);

	q->act8b   = EZ(t->act8b   * 1000,  T);
@@ -82,16 +81,25 @@ static void ide_timing_quantize(struct ide_timing *t, struct ide_timing *q, int 
	q->udma    = EZ(t->udma    * 1000, UT);

}



static void ide_timing_merge(struct ide_timing *a, struct ide_timing *b, struct ide_timing *m, unsigned int what)

static void ide_timing_merge(struct ide_timing *a, struct ide_timing *b,

			     struct ide_timing *m, unsigned int what)

{

	if (what & IDE_TIMING_SETUP  ) m->setup   = max(a->setup,   b->setup);

	if (what & IDE_TIMING_ACT8B  ) m->act8b   = max(a->act8b,   b->act8b);

	if (what & IDE_TIMING_REC8B  ) m->rec8b   = max(a->rec8b,   b->rec8b);

	if (what & IDE_TIMING_CYC8B  ) m->cyc8b   = max(a->cyc8b,   b->cyc8b);

	if (what & IDE_TIMING_ACTIVE ) m->active  = max(a->active,  b->active);

	if (what & IDE_TIMING_RECOVER) m->recover = max(a->recover, b->recover);

	if (what & IDE_TIMING_CYCLE  ) m->cycle   = max(a->cycle,   b->cycle);

	if (what & IDE_TIMING_UDMA   ) m->udma    = max(a->udma,    b->udma);

	if (what & IDE_TIMING_SETUP)

		m->setup   = max(a->setup,   b->setup);

	if (what & IDE_TIMING_ACT8B)

		m->act8b   = max(a->act8b,   b->act8b);

	if (what & IDE_TIMING_REC8B)

		m->rec8b   = max(a->rec8b,   b->rec8b);

	if (what & IDE_TIMING_CYC8B)

		m->cyc8b   = max(a->cyc8b,   b->cyc8b);

	if (what & IDE_TIMING_ACTIVE)

		m->active  = max(a->active,  b->active);

	if (what & IDE_TIMING_RECOVER)

		m->recover = max(a->recover, b->recover);

	if (what & IDE_TIMING_CYCLE)

		m->cycle   = max(a->cycle,   b->cycle);

	if (what & IDE_TIMING_UDMA)

		m->udma    = max(a->udma,    b->udma);

}



static struct ide_timing *ide_timing_find_mode(u8 speed)
@@ -113,21 +121,19 @@ static int ide_timing_compute(ide_drive_t *drive, u8 speed, 
	/*

	 * Find the mode.

	 */



	if (!(s = ide_timing_find_mode(speed)))

	s = ide_timing_find_mode(speed);

	if (s == NULL)

		return -EINVAL;



	/*

	 * Copy the timing from the table.

	 */



	*t = *s;



	/*

	 * If the drive is an EIDE drive, it can tell us it needs extended

	 * PIO/MWDMA cycle timing.

	 */



	if (id && id->field_valid & 2) {	/* EIDE drive */



		memset(&p, 0, sizeof(p));
@@ -145,15 +151,13 @@ static int ide_timing_compute(ide_drive_t *drive, u8 speed, 
	/*

	 * Convert the timing to bus clock counts.

	 */



	ide_timing_quantize(t, t, T, UT);



	/*

 * Even in DMA/UDMA modes we still use PIO access for IDENTIFY, S.M.A.R.T

 * and some other commands. We have to ensure that the DMA cycle timing is

 * slower/equal than the fastest PIO timing.

	 * Even in DMA/UDMA modes we still use PIO access for IDENTIFY,

	 * S.M.A.R.T and some other commands. We have to ensure that the

	 * DMA cycle timing is slower/equal than the fastest PIO timing.

	 */



	if (speed >= XFER_SW_DMA_0) {

		u8 pio = ide_get_best_pio_mode(drive, 255, 5);

		ide_timing_compute(drive, XFER_PIO_0 + pio, &p, T, UT);
@@ -163,7 +167,6 @@ static int ide_timing_compute(ide_drive_t *drive, u8 speed, 
	/*

	 * Lengthen active & recovery time so that cycle time is correct.

	 */



	if (t->act8b + t->rec8b < t->cyc8b) {

		t->act8b += (t->cyc8b - (t->act8b + t->rec8b)) / 2;

		t->rec8b = t->cyc8b - t->act8b;