diff options
Diffstat (limited to 'drivers/atm/horizon.c')
-rw-r--r-- | drivers/atm/horizon.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index c0ac728dc564..615412364e99 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
@@ -635,7 +635,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r, | |||
635 | // take care of rounding | 635 | // take care of rounding |
636 | switch (r) { | 636 | switch (r) { |
637 | case round_down: | 637 | case round_down: |
638 | pre = (br+(c<<div)-1)/(c<<div); | 638 | pre = DIV_ROUND_UP(br, c<<div); |
639 | // but p must be non-zero | 639 | // but p must be non-zero |
640 | if (!pre) | 640 | if (!pre) |
641 | pre = 1; | 641 | pre = 1; |
@@ -668,7 +668,7 @@ static int make_rate (const hrz_dev * dev, u32 c, rounding r, | |||
668 | // take care of rounding | 668 | // take care of rounding |
669 | switch (r) { | 669 | switch (r) { |
670 | case round_down: | 670 | case round_down: |
671 | pre = (br+(c<<div)-1)/(c<<div); | 671 | pre = DIV_ROUND_UP(br, c<<div); |
672 | break; | 672 | break; |
673 | case round_nearest: | 673 | case round_nearest: |
674 | pre = (br+(c<<div)/2)/(c<<div); | 674 | pre = (br+(c<<div)/2)/(c<<div); |
@@ -698,7 +698,7 @@ got_it: | |||
698 | if (bits) | 698 | if (bits) |
699 | *bits = (div<<CLOCK_SELECT_SHIFT) | (pre-1); | 699 | *bits = (div<<CLOCK_SELECT_SHIFT) | (pre-1); |
700 | if (actual) { | 700 | if (actual) { |
701 | *actual = (br + (pre<<div) - 1) / (pre<<div); | 701 | *actual = DIV_ROUND_UP(br, pre<<div); |
702 | PRINTD (DBG_QOS, "actual rate: %u", *actual); | 702 | PRINTD (DBG_QOS, "actual rate: %u", *actual); |
703 | } | 703 | } |
704 | return 0; | 704 | return 0; |
@@ -1967,7 +1967,7 @@ static int __devinit hrz_init (hrz_dev * dev) { | |||
1967 | // Set the max AAL5 cell count to be just enough to contain the | 1967 | // Set the max AAL5 cell count to be just enough to contain the |
1968 | // largest AAL5 frame that the user wants to receive | 1968 | // largest AAL5 frame that the user wants to receive |
1969 | wr_regw (dev, MAX_AAL5_CELL_COUNT_OFF, | 1969 | wr_regw (dev, MAX_AAL5_CELL_COUNT_OFF, |
1970 | (max_rx_size + ATM_AAL5_TRAILER + ATM_CELL_PAYLOAD - 1) / ATM_CELL_PAYLOAD); | 1970 | DIV_ROUND_UP(max_rx_size + ATM_AAL5_TRAILER, ATM_CELL_PAYLOAD)); |
1971 | 1971 | ||
1972 | // Enable receive | 1972 | // Enable receive |
1973 | wr_regw (dev, RX_CONFIG_OFF, rd_regw (dev, RX_CONFIG_OFF) | RX_ENABLE); | 1973 | wr_regw (dev, RX_CONFIG_OFF, rd_regw (dev, RX_CONFIG_OFF) | RX_ENABLE); |