Am 03.05.2014 22:20, schrieb Dan Carpenter:
> The indenting is off the ifdefed code is intended to be a part of the
> body of the if statement. I have cleaned it up a bit.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
>
> diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c
> index 414dbf6..aaade90 100644
> --- a/drivers/isdn/hisax/hfc4s8s_l1.c
> +++ b/drivers/isdn/hisax/hfc4s8s_l1.c
> @@ -738,12 +738,13 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
> z1 -= 4;
> }
>
> - while (z1--)
> + while (z1--) {
> #ifdef HISAX_HFC4S8S_PCIMEM
> Read_hfc8(l1p->hw, A_FIFO_DATA0);
> #else
> - fRead_hfc8(l1p->hw);
> + fRead_hfc8(l1p->hw);
> #endif
> + }
>
> Write_hfc8(l1p->hw, A_INC_RES_FIFO, 1);
> wait_busy(l1p->hw);
> @@ -768,12 +769,13 @@ rx_d_frame(struct hfc4s8s_l1 *l1p, int ech)
> z1 -= 4;
> }
>
> - while (z1--)
> + while (z1--) {
> #ifdef HISAX_HFC4S8S_PCIMEM
> *cp++ = Read_hfc8(l1p->hw, A_FIFO_DATA0);
> #else
> - *cp++ = fRead_hfc8(l1p->hw);
> + *cp++ = fRead_hfc8(l1p->hw);
> #endif
> + }
>
> Write_hfc8(l1p->hw, A_INC_RES_FIFO, 1); /* increment f counter */
> wait_busy(l1p->hw);
> @@ -875,12 +877,13 @@ rx_b_frame(struct hfc4s8s_btype *bch)
> z1 -= 4;
> }
>
> - while (z1--)
> + while (z1--) {
> #ifdef HISAX_HFC4S8S_PCIMEM
> *(bch->rx_ptr++) = Read_hfc8(l1->hw, A_FIFO_DATA0);
> #else
> - *(bch->rx_ptr++) = fRead_hfc8(l1->hw);
> + *(bch->rx_ptr++) = fRead_hfc8(l1->hw);
> #endif
> + }
>
> if (hdlc_complete) {
> /* increment f counter */
> @@ -1051,12 +1054,13 @@ tx_b_frame(struct hfc4s8s_btype *bch)
> cnt -= 4;
> }
>
> - while (cnt--)
> + while (cnt--) {
> #ifdef HISAX_HFC4S8S_PCIMEM
> fWrite_hfc8(l1->hw, A_FIFO_DATA0, *cp++);
> #else
> - fWrite_hfc8(l1->hw, *cp++);
> + fWrite_hfc8(l1->hw, *cp++);
> #endif
> + }
This looks wrong. The read above uses Read_hfc8/fRead_hfc8 (easy to confuse but i am not the maintainer ....)
here we have 2* fWrite_hfc8() ?
Does this compile with HISAX_HFC4S8S_PCIMEM ??
re,
wh
>
> if (bch->tx_cnt >= skb->len) {
> if (bch->mode == L1_MODE_HDLC) {
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
