Commit 4e168187 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jens Axboe
Browse files

ata: fix CodingStyle issues in PATA timings code 



* fix the overly long line in ata_timing_quantize()

* use standard kernel CodingStyle in ata_timing_merge()

* do not use assignment in if condition in ata_timing_compute()

* fix non-standard comment style in ata_timing_compute()

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2b67a6d3

drivers/ata/libata-core.c

+27 −15
Original line number Diff line number Diff line
@@ -3251,7 +3251,8 @@ static const struct ata_timing ata_timing[] = { 
#define ENOUGH(v, unit)		(((v)-1)/(unit)+1)

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



static void ata_timing_quantize(const struct ata_timing *t, struct ata_timing *q, int T, int UT)

static void ata_timing_quantize(const struct ata_timing *t,

				struct ata_timing *q, int T, int UT)

{

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

	q->act8b	= EZ(t->act8b,       T);
@@ -3267,15 +3268,24 @@ static void ata_timing_quantize(const struct ata_timing *t, struct ata_timing *q 
void ata_timing_merge(const struct ata_timing *a, const struct ata_timing *b,

		      struct ata_timing *m, unsigned int what)

{

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

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

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

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

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

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

	if (what & ATA_TIMING_DMACK_HOLD) m->dmack_hold = max(a->dmack_hold, b->dmack_hold);

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

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

	if (what & ATA_TIMING_SETUP)

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

	if (what & ATA_TIMING_ACT8B)

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

	if (what & ATA_TIMING_REC8B)

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

	if (what & ATA_TIMING_CYC8B)

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

	if (what & ATA_TIMING_ACTIVE)

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

	if (what & ATA_TIMING_RECOVER)

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

	if (what & ATA_TIMING_DMACK_HOLD)

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

	if (what & ATA_TIMING_CYCLE)

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

	if (what & ATA_TIMING_UDMA)

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

}

EXPORT_SYMBOL_GPL(ata_timing_merge);
@@ -3306,8 +3316,8 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, 
	/*

	 * Find the mode.

	 */



	if (!(s = ata_timing_find_mode(speed)))

	s = ata_timing_find_mode(speed);

	if (!s)

		return -EINVAL;



	memcpy(t, s, sizeof(*s));
@@ -3363,9 +3373,11 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, 
		t->recover = t->cycle - t->active;

	}



	/* In a few cases quantisation may produce enough errors to

	   leave t->cycle too low for the sum of active and recovery

	   if so we must correct this */

	/*

	 * In a few cases quantisation may produce enough errors to

	 * leave t->cycle too low for the sum of active and recovery

	 * if so we must correct this.

	 */

	if (t->active + t->recover > t->cycle)

		t->cycle = t->active + t->recover;

CRA Git | Maintained and supported by SUSTech CRA and CCSE