diff options
author | David Cross | 2010-09-24 02:24:45 +0200 |
---|---|---|
committer | Greg Kroah-Hartman | 2010-09-30 03:28:26 +0200 |
commit | 0769c38d26bdb2941385c32ff66a25beeb987f75 (patch) | |
tree | 9bf7d7801a2df098dc3b1aadfe562ce8fc5bb776 /drivers/staging/westbridge/astoria/api/src/cyasintr.c | |
parent | Staging: west bridge, cyasgadget fix for usb_gadget_probe_driver (diff) | |
download | kernel-qcow2-linux-0769c38d26bdb2941385c32ff66a25beeb987f75.tar.gz kernel-qcow2-linux-0769c38d26bdb2941385c32ff66a25beeb987f75.tar.xz kernel-qcow2-linux-0769c38d26bdb2941385c32ff66a25beeb987f75.zip |
Staging: west bridge, removal of " " before ";"
This patch fixes removes all of the the " ;"'s in the west bridge driver
and instead replaces them with ";" only. Although this is a large patch,
this is the only thing that it does. I can break it up on a file basis
if needed.
Signed-off-by: David Cross <david.cross@cypress.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/westbridge/astoria/api/src/cyasintr.c')
-rw-r--r-- | drivers/staging/westbridge/astoria/api/src/cyasintr.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasintr.c b/drivers/staging/westbridge/astoria/api/src/cyasintr.c index aea6c3ebf067..b60f69ce5985 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasintr.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasintr.c @@ -24,80 +24,80 @@ #include "../../include/linux/westbridge/cyasregs.h" #include "../../include/linux/westbridge/cyaserr.h" -extern void cy_as_mail_box_interrupt_handler(cy_as_device *) ; +extern void cy_as_mail_box_interrupt_handler(cy_as_device *); void cy_as_mcu_interrupt_handler(cy_as_device *dev_p) { /* Read and clear the interrupt. */ - uint16_t v ; + uint16_t v; - v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_P0_MCU_STAT) ; - v = v ; + v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_P0_MCU_STAT); + v = v; } void cy_as_power_management_interrupt_handler(cy_as_device *dev_p) { - uint16_t v ; + uint16_t v; - v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_PWR_MAGT_STAT) ; - v = v ; + v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_PWR_MAGT_STAT); + v = v; } void cy_as_pll_lock_loss_interrupt_handler(cy_as_device *dev_p) { - uint16_t v ; + uint16_t v; - v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_PLL_LOCK_LOSS_STAT) ; - v = v ; + v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_PLL_LOCK_LOSS_STAT); + v = v; } uint32_t cy_as_intr_start(cy_as_device *dev_p, cy_bool dmaintr) { - uint16_t v ; + uint16_t v; - cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE) ; + cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE); if (cy_as_device_is_intr_running(dev_p) != 0) - return CY_AS_ERROR_ALREADY_RUNNING ; + return CY_AS_ERROR_ALREADY_RUNNING; v = CY_AS_MEM_P0_INT_MASK_REG_MMCUINT | CY_AS_MEM_P0_INT_MASK_REG_MMBINT | - CY_AS_MEM_P0_INT_MASK_REG_MPMINT ; + CY_AS_MEM_P0_INT_MASK_REG_MPMINT; if (dmaintr) - v |= CY_AS_MEM_P0_INT_MASK_REG_MDRQINT ; + v |= CY_AS_MEM_P0_INT_MASK_REG_MDRQINT; /* Enable the interrupts of interest */ - cy_as_hal_write_register(dev_p->tag, CY_AS_MEM_P0_INT_MASK_REG, v) ; + cy_as_hal_write_register(dev_p->tag, CY_AS_MEM_P0_INT_MASK_REG, v); /* Mark the interrupt module as initialized */ - cy_as_device_set_intr_running(dev_p) ; + cy_as_device_set_intr_running(dev_p); - return CY_AS_ERROR_SUCCESS ; + return CY_AS_ERROR_SUCCESS; } uint32_t cy_as_intr_stop(cy_as_device *dev_p) { - cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE) ; + cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE); if (cy_as_device_is_intr_running(dev_p) == 0) - return CY_AS_ERROR_NOT_RUNNING ; + return CY_AS_ERROR_NOT_RUNNING; - cy_as_hal_write_register(dev_p->tag, CY_AS_MEM_P0_INT_MASK_REG, 0) ; - cy_as_device_set_intr_stopped(dev_p) ; + cy_as_hal_write_register(dev_p->tag, CY_AS_MEM_P0_INT_MASK_REG, 0); + cy_as_device_set_intr_stopped(dev_p); - return CY_AS_ERROR_SUCCESS ; + return CY_AS_ERROR_SUCCESS; } void cy_as_intr_service_interrupt(cy_as_hal_device_tag tag) { - uint16_t v ; - cy_as_device *dev_p ; + uint16_t v; + cy_as_device *dev_p; - dev_p = cy_as_device_find_from_tag(tag) ; + dev_p = cy_as_device_find_from_tag(tag); /* * only power management interrupts can occur before the @@ -105,39 +105,39 @@ void cy_as_intr_service_interrupt(cy_as_hal_device_tag tag) * handle it here; otherwise output a warning message. */ if (dev_p == 0) { - v = cy_as_hal_read_register(tag, CY_AS_MEM_P0_INTR_REG) ; + v = cy_as_hal_read_register(tag, CY_AS_MEM_P0_INTR_REG); if (v == CY_AS_MEM_P0_INTR_REG_PMINT) { /* Read the PWR_MAGT_STAT register * to clear this interrupt. */ v = cy_as_hal_read_register(tag, - CY_AS_MEM_PWR_MAGT_STAT) ; + CY_AS_MEM_PWR_MAGT_STAT); } else cy_as_hal_print_message("stray antioch " "interrupt detected" ", tag not associated " - "with any created device.") ; - return ; + "with any created device."); + return; } /* Make sure we got a valid object from CyAsDeviceFindFromTag */ - cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE) ; + cy_as_hal_assert(dev_p->sig == CY_AS_DEVICE_HANDLE_SIGNATURE); - v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_P0_INTR_REG) ; + v = cy_as_hal_read_register(dev_p->tag, CY_AS_MEM_P0_INTR_REG); if (v & CY_AS_MEM_P0_INTR_REG_MCUINT) - cy_as_mcu_interrupt_handler(dev_p) ; + cy_as_mcu_interrupt_handler(dev_p); if (v & CY_AS_MEM_P0_INTR_REG_PMINT) - cy_as_power_management_interrupt_handler(dev_p) ; + cy_as_power_management_interrupt_handler(dev_p); if (v & CY_AS_MEM_P0_INTR_REG_PLLLOCKINT) - cy_as_pll_lock_loss_interrupt_handler(dev_p) ; + cy_as_pll_lock_loss_interrupt_handler(dev_p); /* If the interrupt module is not running, no mailbox * interrupts are expected from the west bridge. */ if (cy_as_device_is_intr_running(dev_p) == 0) - return ; + return; if (v & CY_AS_MEM_P0_INTR_REG_MBINT) - cy_as_mail_box_interrupt_handler(dev_p) ; + cy_as_mail_box_interrupt_handler(dev_p); } |