Signed-off-by: Graeme Russ <graeme.r...@gmail.com>
---
Changes for v2:
 - Consolidated patch series

 board/eNET/eNET.c     |    8 ++++----
 board/eNET/eNET_pci.c |   19 +++++++++----------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c
index c4ed820..429fe1b 100644
--- a/board/eNET/eNET.c
+++ b/board/eNET/eNET.c
@@ -223,7 +223,7 @@ void setup_pcat_compatibility()
         *  active low polarity on PIC interrupt pins,
         *  active high polarity on all other irq pins
         */
-       writew(0x0000,&sc520_mmcr->intpinpol);
+       writew(0x0000, &sc520_mmcr->intpinpol);

        /*
         * PIT 0 -> IRQ0
@@ -252,7 +252,7 @@ void setup_pcat_compatibility()

 void enet_timer_isr(void)
 {
-       static long enet_ticks = 0;
+       static long enet_ticks;

        enet_ticks++;

@@ -281,9 +281,9 @@ void hw_watchdog_reset(void)

 void enet_toggle_run_led(void)
 {
-       unsigned char leds_state= inb(LED_LATCH_ADDRESS);
+       unsigned char leds_state = inb(LED_LATCH_ADDRESS);
        if (leds_state & LED_RUN_BITMASK)
-               outb(leds_state &~ LED_RUN_BITMASK, LED_LATCH_ADDRESS);
+               outb(leds_state & ~LED_RUN_BITMASK, LED_LATCH_ADDRESS);
        else
                outb(leds_state | LED_RUN_BITMASK, LED_LATCH_ADDRESS);
 }
diff --git a/board/eNET/eNET_pci.c b/board/eNET/eNET_pci.c
index 29d13d2..5af4ef7 100644
--- a/board/eNET/eNET_pci.c
+++ b/board/eNET/eNET_pci.c
@@ -38,7 +38,7 @@ static void pci_enet_fixup_irq(struct pci_controller *hose, 
pci_dev_t dev)
                CONFIG_SYS_THIRD_PCI_IRQ,
                CONFIG_SYS_FORTH_PCI_IRQ
        };
-       static int next_irq_index=0;
+       static int next_irq_index;

        uchar tmp_pin;
        int pin;
@@ -47,9 +47,8 @@ static void pci_enet_fixup_irq(struct pci_controller *hose, 
pci_dev_t dev)
        pin = tmp_pin;

        pin -= 1; /* PCI config space use 1-based numbering */
-       if (pin == -1) {
+       if (pin == -1)
                return; /* device use no irq */
-       }

        /* map device number +  pin to a pin on the sc520 */
        switch (PCI_DEV(dev)) {
@@ -69,19 +68,19 @@ static void pci_enet_fixup_irq(struct pci_controller *hose, 
pci_dev_t dev)

        if (sc520_pci_ints[pin] == -1) {
                /* re-route one interrupt for us */
-               if (next_irq_index > 3) {
+               if (next_irq_index > 3)
                        return;
-               }
-               if (pci_sc520_set_irq(pin, irq_list[next_irq_index])) {
+
+               if (pci_sc520_set_irq(pin, irq_list[next_irq_index]))
                        return;
-               }
+
                next_irq_index++;
        }

-       if (-1 != sc520_pci_ints[pin]) {
-       pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE,
+       if (-1 != sc520_pci_ints[pin])
+               pci_hose_write_config_byte(hose, dev, PCI_INTERRUPT_LINE,
                                           sc520_pci_ints[pin]);
-       }
+
        printf("fixup_irq: device %d pin %c irq %d\n",
               PCI_DEV(dev), 'A' + pin, sc520_pci_ints[pin]);
 }
--
1.7.5.2.317.g391b14

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to