summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@codeaurora.org>2010-03-16 15:20:07 -0700
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 09:15:39 -0700
commit79848a2a7333eee6424b38c05b4ea4a0ce56eb47 (patch)
tree4775b1c6ba32ad4c2acc073b47e72c5cb859e332 /arch
parent93873bcbd16f7233dd5a20280af8e5394e702a8b (diff)
downloadblackbird-op-linux-79848a2a7333eee6424b38c05b4ea4a0ce56eb47.tar.gz
blackbird-op-linux-79848a2a7333eee6424b38c05b4ea4a0ce56eb47.zip
arm: msm: smd: checkpatch clean up of smd/proc_comm
This cleans up coding style. There are no run time changes. Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-msm/include/mach/msm_smd.h5
-rw-r--r--arch/arm/mach-msm/proc_comm.h4
-rw-r--r--arch/arm/mach-msm/smd.c8
-rw-r--r--arch/arm/mach-msm/smd_private.h24
4 files changed, 17 insertions, 24 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_smd.h b/arch/arm/mach-msm/include/mach/msm_smd.h
index aa076e466e4c..029463ec8756 100644
--- a/arch/arm/mach-msm/include/mach/msm_smd.h
+++ b/arch/arm/mach-msm/include/mach/msm_smd.h
@@ -19,6 +19,8 @@
typedef struct smd_channel smd_channel_t;
+extern int (*msm_check_for_modem_crash)(void);
+
/* warning: notify() may be called before open returns */
int smd_open(const char *name, smd_channel_t **ch, void *priv,
void (*notify)(void *priv, unsigned event));
@@ -63,8 +65,7 @@ int smd_wait_until_readable(smd_channel_t *ch, int bytes);
int smd_wait_until_writable(smd_channel_t *ch, int bytes);
#endif
-typedef enum
-{
+typedef enum {
SMD_PORT_DS = 0,
SMD_PORT_DIAG,
SMD_PORT_RPC_CALL,
diff --git a/arch/arm/mach-msm/proc_comm.h b/arch/arm/mach-msm/proc_comm.h
index 235076533c03..0f5cdd345eb7 100644
--- a/arch/arm/mach-msm/proc_comm.h
+++ b/arch/arm/mach-msm/proc_comm.h
@@ -217,8 +217,8 @@ enum vreg_pdown_id {
};
enum {
- PCOM_CLKRGM_APPS_RESET_USB_PHY = 34,
- PCOM_CLKRGM_APPS_RESET_USBH = 37,
+ PCOM_CLKRGM_APPS_RESET_USB_PHY = 34,
+ PCOM_CLKRGM_APPS_RESET_USBH = 37,
};
/* gpio info for PCOM_RPC_GPIO_TLMM_CONFIG_EX */
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index b6966680a2d8..b864592cbe05 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -123,8 +123,6 @@ static void handle_modem_crash(void)
;
}
-extern int (*msm_check_for_modem_crash)(void);
-
uint32_t raw_smsm_get_state(enum smsm_state_item item)
{
return readl(smd_info.state + item * 4);
@@ -904,9 +902,9 @@ static irqreturn_t smsm_irq_handler(int irq, void *data)
if (msm_smd_debug_mask & MSM_SMSM_DEBUG)
pr_info("<SM %08x %08x>\n", apps, modm);
- if (modm & SMSM_RESET) {
+ if (modm & SMSM_RESET)
handle_modem_crash();
- }
+
do_smd_probe();
spin_unlock_irqrestore(&smem_lock, flags);
@@ -1056,8 +1054,6 @@ int smd_core_init(void)
return 0;
}
-extern void msm_init_last_radio_log(struct module *);
-
static int __init msm_smd_probe(struct platform_device *pdev)
{
pr_info("smd_init()\n");
diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h
index 2da758e65025..33a33f1b01f8 100644
--- a/arch/arm/mach-msm/smd_private.h
+++ b/arch/arm/mach-msm/smd_private.h
@@ -20,24 +20,21 @@
#include <linux/spinlock.h>
#include <linux/list.h>
-struct smem_heap_info
-{
+struct smem_heap_info {
unsigned initialized;
unsigned free_offset;
unsigned heap_remaining;
unsigned reserved;
};
-struct smem_heap_entry
-{
+struct smem_heap_entry {
unsigned allocated;
unsigned offset;
unsigned size;
unsigned reserved;
};
-struct smem_proc_comm
-{
+struct smem_proc_comm {
unsigned command;
unsigned status;
unsigned data1;
@@ -54,8 +51,7 @@ struct smem_proc_comm
#define VERSION_APPS 8
#define VERSION_MODEM 9
-struct smem_shared
-{
+struct smem_shared {
struct smem_proc_comm proc_comm[4];
unsigned version[32];
struct smem_heap_info heap_info;
@@ -66,8 +62,7 @@ struct smem_shared
#define SMSM_V2_SIZE (sizeof(unsigned) * 4)
#ifndef CONFIG_ARCH_MSM_SCORPION
-struct smsm_interrupt_info
-{
+struct smsm_interrupt_info {
uint32_t interrupt_mask;
uint32_t pending_interrupts;
uint32_t wakeup_reason;
@@ -156,8 +151,7 @@ void smsm_print_sleep_info(void);
#define SMEM_NUM_SMD_CHANNELS 64
-typedef enum
-{
+typedef enum {
/* fixed items */
SMEM_PROC_COMM = 0,
SMEM_HEAP_INFO,
@@ -232,7 +226,7 @@ typedef enum
SMEM_SMEM_LOG_POWER_WRAP,
SMEM_SMEM_LOG_POWER_EVENTS,
SMEM_ERR_CRASH_LOG,
- SMEM_ERR_F3_TRACE_LOG,
+ SMEM_ERR_F3_TRACE_LOG,
SMEM_NUM_ITEMS,
} smem_mem_type;
@@ -281,7 +275,7 @@ struct smd_shared_v1 {
struct smd_shared_v2 {
struct smd_half_channel ch0;
struct smd_half_channel ch1;
-};
+};
struct smd_channel {
volatile struct smd_half_channel *send;
@@ -334,4 +328,6 @@ void *smem_find(unsigned id, unsigned size);
void *smem_item(unsigned id, unsigned *size);
uint32_t raw_smsm_get_state(enum smsm_state_item item);
+extern void msm_init_last_radio_log(struct module *);
+
#endif
OpenPOWER on IntegriCloud