Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] mb86a20s: better name temp vars at mb86a20s_layer_bitrate()

Using 'i' for the guard interval temporary var is a bad idea, as
'i' is generally used by "anonymous" indexes.
Let's rename modulation, fec and guard interval temp vars with
a meaningful name, as that makes easier to understand the code
and avoids cut-and-paste types of error.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

+19 -18
+19 -18
drivers/media/dvb-frontends/mb86a20s.c
··· 566 566 }; 567 567 568 568 static void mb86a20s_layer_bitrate(struct dvb_frontend *fe, u32 layer, 569 - u32 modulation, u32 fec, u32 interleaving, 569 + u32 modulation, u32 forward_error_correction, 570 + u32 interleaving, 570 571 u32 segment) 571 572 { 572 573 struct mb86a20s_state *state = fe->demodulator_priv; 573 574 u32 rate; 574 - int m, f, i; 575 + int mod, fec, guard; 575 576 576 577 /* 577 578 * If modulation/fec/interleaving is not detected, the default is ··· 583 582 case DQPSK: 584 583 case QPSK: 585 584 default: 586 - m = 0; 585 + mod = 0; 587 586 break; 588 587 case QAM_16: 589 - m = 1; 588 + mod = 1; 590 589 break; 591 590 case QAM_64: 592 - m = 2; 591 + mod = 2; 593 592 break; 594 593 } 595 594 596 - switch (fec) { 595 + switch (forward_error_correction) { 597 596 default: 598 597 case FEC_1_2: 599 598 case FEC_AUTO: 600 - f = 0; 599 + fec = 0; 601 600 break; 602 601 case FEC_2_3: 603 - f = 1; 602 + fec = 1; 604 603 break; 605 604 case FEC_3_4: 606 - f = 2; 605 + fec = 2; 607 606 break; 608 607 case FEC_5_6: 609 - f = 3; 608 + fec = 3; 610 609 break; 611 610 case FEC_7_8: 612 - f = 4; 611 + fec = 4; 613 612 break; 614 613 } 615 614 616 615 switch (interleaving) { 617 616 default: 618 617 case GUARD_INTERVAL_1_4: 619 - i = 0; 618 + guard = 0; 620 619 break; 621 620 case GUARD_INTERVAL_1_8: 622 - i = 1; 621 + guard = 1; 623 622 break; 624 623 case GUARD_INTERVAL_1_16: 625 - i = 2; 624 + guard = 2; 626 625 break; 627 626 case GUARD_INTERVAL_1_32: 628 - i = 3; 627 + guard = 3; 629 628 break; 630 629 } 631 630 632 631 /* Samples BER at BER_SAMPLING_RATE seconds */ 633 - rate = isdbt_rate[m][f][i] * segment * BER_SAMPLING_RATE; 632 + rate = isdbt_rate[mod][fec][guard] * segment * BER_SAMPLING_RATE; 634 633 635 634 /* Avoids sampling too quickly or to overflow the register */ 636 635 if (rate < 256) ··· 640 639 641 640 dev_dbg(&state->i2c->dev, 642 641 "%s: layer %c bitrate: %d kbps; counter = %d (0x%06x)\n", 643 - __func__, 'A' + layer, segment * isdbt_rate[m][f][i]/1000, 642 + __func__, 'A' + layer, 643 + segment * isdbt_rate[mod][fec][guard]/1000, 644 644 rate, rate); 645 645 646 646 state->estimated_rate[layer] = rate; 647 647 } 648 - 649 648 650 649 static int mb86a20s_get_frontend(struct dvb_frontend *fe) 651 650 {