Skip to content

Commit

Permalink
[media] ite-cir: clean up odd spacing in ite8709 bits
Browse files Browse the repository at this point in the history
There was some rather odd spacing in a few of the ite8709-specific
functions that made it hard to read those sections of code. This is just
a simple reformatting.

CC: Juan Jesús García de Soria <skandalfo@gmail.com>
Signed-off-by: Jarod Wilson <jarod@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Jarod Wilson authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent ae7b4d4 commit f0c1629
Showing 1 changed file with 18 additions and 28 deletions.
46 changes: 18 additions & 28 deletions drivers/media/rc/ite-cir.c
Original file line number Diff line number Diff line change
Expand Up @@ -1250,11 +1250,9 @@ static void it8709_disable(struct ite_dev *dev)
ite_dbg("%s called", __func__);

/* clear out all interrupt enable flags */
it8709_wr(dev,
it8709_rr(dev,
IT85_C0IER) & ~(IT85_IEC | IT85_RFOIE |
IT85_RDAIE |
IT85_TLDLIE), IT85_C0IER);
it8709_wr(dev, it8709_rr(dev, IT85_C0IER) &
~(IT85_IEC | IT85_RFOIE | IT85_RDAIE | IT85_TLDLIE),
IT85_C0IER);

/* disable the receiver */
it8709_disable_rx(dev);
Expand All @@ -1270,40 +1268,32 @@ static void it8709_init_hardware(struct ite_dev *dev)
ite_dbg("%s called", __func__);

/* disable all the interrupts */
it8709_wr(dev,
it8709_rr(dev,
IT85_C0IER) & ~(IT85_IEC | IT85_RFOIE |
IT85_RDAIE |
IT85_TLDLIE), IT85_C0IER);
it8709_wr(dev, it8709_rr(dev, IT85_C0IER) &
~(IT85_IEC | IT85_RFOIE | IT85_RDAIE | IT85_TLDLIE),
IT85_C0IER);

/* program the baud rate divisor */
it8709_wr(dev, ITE_BAUDRATE_DIVISOR & 0xff, IT85_C0BDLR);
it8709_wr(dev, (ITE_BAUDRATE_DIVISOR >> 8) & 0xff,
IT85_C0BDHR);

/* program the C0MSTCR register defaults */
it8709_wr(dev, (it8709_rr(dev, IT85_C0MSTCR) & ~(IT85_ILSEL |
IT85_ILE
| IT85_FIFOTL
|
IT85_FIFOCLR
|
IT85_RESET))
| IT85_FIFOTL_DEFAULT, IT85_C0MSTCR);
it8709_wr(dev, (it8709_rr(dev, IT85_C0MSTCR) &
~(IT85_ILSEL | IT85_ILE | IT85_FIFOTL
| IT85_FIFOCLR | IT85_RESET)) | IT85_FIFOTL_DEFAULT,
IT85_C0MSTCR);

/* program the C0RCR register defaults */
it8709_wr(dev,
(it8709_rr(dev, IT85_C0RCR) &
~(IT85_RXEN | IT85_RDWOS | IT85_RXEND
| IT85_RXACT | IT85_RXDCR)) |
ITE_RXDCR_DEFAULT, IT85_C0RCR);
it8709_wr(dev, (it8709_rr(dev, IT85_C0RCR) &
~(IT85_RXEN | IT85_RDWOS | IT85_RXEND | IT85_RXACT
| IT85_RXDCR)) | ITE_RXDCR_DEFAULT,
IT85_C0RCR);

/* program the C0TCR register defaults */
it8709_wr(dev, (it8709_rr(dev, IT85_C0TCR)
&~(IT85_TXMPM | IT85_TXMPW))
|IT85_TXRLE | IT85_TXENDF |
IT85_TXMPM_DEFAULT |
IT85_TXMPW_DEFAULT, IT85_C0TCR);
it8709_wr(dev, (it8709_rr(dev, IT85_C0TCR) & ~(IT85_TXMPM | IT85_TXMPW))
| IT85_TXRLE | IT85_TXENDF | IT85_TXMPM_DEFAULT
| IT85_TXMPW_DEFAULT,
IT85_C0TCR);

/* program the carrier parameters */
ite_set_carrier_params(dev);
Expand Down

0 comments on commit f0c1629

Please sign in to comment.