Commit 79848a2a authored by Daniel Walker's avatar Daniel Walker

arm: msm: smd: checkpatch clean up of smd/proc_comm

This cleans up coding style. There are no run time changes.
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 93873bcb
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
typedef struct smd_channel smd_channel_t; typedef struct smd_channel smd_channel_t;
extern int (*msm_check_for_modem_crash)(void);
/* warning: notify() may be called before open returns */ /* warning: notify() may be called before open returns */
int smd_open(const char *name, smd_channel_t **ch, void *priv, int smd_open(const char *name, smd_channel_t **ch, void *priv,
void (*notify)(void *priv, unsigned event)); void (*notify)(void *priv, unsigned event));
...@@ -63,8 +65,7 @@ int smd_wait_until_readable(smd_channel_t *ch, int bytes); ...@@ -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); int smd_wait_until_writable(smd_channel_t *ch, int bytes);
#endif #endif
typedef enum typedef enum {
{
SMD_PORT_DS = 0, SMD_PORT_DS = 0,
SMD_PORT_DIAG, SMD_PORT_DIAG,
SMD_PORT_RPC_CALL, SMD_PORT_RPC_CALL,
......
...@@ -217,8 +217,8 @@ enum vreg_pdown_id { ...@@ -217,8 +217,8 @@ enum vreg_pdown_id {
}; };
enum { enum {
PCOM_CLKRGM_APPS_RESET_USB_PHY = 34, PCOM_CLKRGM_APPS_RESET_USB_PHY = 34,
PCOM_CLKRGM_APPS_RESET_USBH = 37, PCOM_CLKRGM_APPS_RESET_USBH = 37,
}; };
/* gpio info for PCOM_RPC_GPIO_TLMM_CONFIG_EX */ /* gpio info for PCOM_RPC_GPIO_TLMM_CONFIG_EX */
......
...@@ -123,8 +123,6 @@ static void handle_modem_crash(void) ...@@ -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) uint32_t raw_smsm_get_state(enum smsm_state_item item)
{ {
return readl(smd_info.state + item * 4); return readl(smd_info.state + item * 4);
...@@ -904,9 +902,9 @@ static irqreturn_t smsm_irq_handler(int irq, void *data) ...@@ -904,9 +902,9 @@ static irqreturn_t smsm_irq_handler(int irq, void *data)
if (msm_smd_debug_mask & MSM_SMSM_DEBUG) if (msm_smd_debug_mask & MSM_SMSM_DEBUG)
pr_info("<SM %08x %08x>\n", apps, modm); pr_info("<SM %08x %08x>\n", apps, modm);
if (modm & SMSM_RESET) { if (modm & SMSM_RESET)
handle_modem_crash(); handle_modem_crash();
}
do_smd_probe(); do_smd_probe();
spin_unlock_irqrestore(&smem_lock, flags); spin_unlock_irqrestore(&smem_lock, flags);
...@@ -1056,8 +1054,6 @@ int smd_core_init(void) ...@@ -1056,8 +1054,6 @@ int smd_core_init(void)
return 0; return 0;
} }
extern void msm_init_last_radio_log(struct module *);
static int __init msm_smd_probe(struct platform_device *pdev) static int __init msm_smd_probe(struct platform_device *pdev)
{ {
pr_info("smd_init()\n"); pr_info("smd_init()\n");
......
...@@ -20,24 +20,21 @@ ...@@ -20,24 +20,21 @@
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/list.h> #include <linux/list.h>
struct smem_heap_info struct smem_heap_info {
{
unsigned initialized; unsigned initialized;
unsigned free_offset; unsigned free_offset;
unsigned heap_remaining; unsigned heap_remaining;
unsigned reserved; unsigned reserved;
}; };
struct smem_heap_entry struct smem_heap_entry {
{
unsigned allocated; unsigned allocated;
unsigned offset; unsigned offset;
unsigned size; unsigned size;
unsigned reserved; unsigned reserved;
}; };
struct smem_proc_comm struct smem_proc_comm {
{
unsigned command; unsigned command;
unsigned status; unsigned status;
unsigned data1; unsigned data1;
...@@ -54,8 +51,7 @@ struct smem_proc_comm ...@@ -54,8 +51,7 @@ struct smem_proc_comm
#define VERSION_APPS 8 #define VERSION_APPS 8
#define VERSION_MODEM 9 #define VERSION_MODEM 9
struct smem_shared struct smem_shared {
{
struct smem_proc_comm proc_comm[4]; struct smem_proc_comm proc_comm[4];
unsigned version[32]; unsigned version[32];
struct smem_heap_info heap_info; struct smem_heap_info heap_info;
...@@ -66,8 +62,7 @@ struct smem_shared ...@@ -66,8 +62,7 @@ struct smem_shared
#define SMSM_V2_SIZE (sizeof(unsigned) * 4) #define SMSM_V2_SIZE (sizeof(unsigned) * 4)
#ifndef CONFIG_ARCH_MSM_SCORPION #ifndef CONFIG_ARCH_MSM_SCORPION
struct smsm_interrupt_info struct smsm_interrupt_info {
{
uint32_t interrupt_mask; uint32_t interrupt_mask;
uint32_t pending_interrupts; uint32_t pending_interrupts;
uint32_t wakeup_reason; uint32_t wakeup_reason;
...@@ -156,8 +151,7 @@ void smsm_print_sleep_info(void); ...@@ -156,8 +151,7 @@ void smsm_print_sleep_info(void);
#define SMEM_NUM_SMD_CHANNELS 64 #define SMEM_NUM_SMD_CHANNELS 64
typedef enum typedef enum {
{
/* fixed items */ /* fixed items */
SMEM_PROC_COMM = 0, SMEM_PROC_COMM = 0,
SMEM_HEAP_INFO, SMEM_HEAP_INFO,
...@@ -232,7 +226,7 @@ typedef enum ...@@ -232,7 +226,7 @@ typedef enum
SMEM_SMEM_LOG_POWER_WRAP, SMEM_SMEM_LOG_POWER_WRAP,
SMEM_SMEM_LOG_POWER_EVENTS, SMEM_SMEM_LOG_POWER_EVENTS,
SMEM_ERR_CRASH_LOG, SMEM_ERR_CRASH_LOG,
SMEM_ERR_F3_TRACE_LOG, SMEM_ERR_F3_TRACE_LOG,
SMEM_NUM_ITEMS, SMEM_NUM_ITEMS,
} smem_mem_type; } smem_mem_type;
...@@ -281,7 +275,7 @@ struct smd_shared_v1 { ...@@ -281,7 +275,7 @@ struct smd_shared_v1 {
struct smd_shared_v2 { struct smd_shared_v2 {
struct smd_half_channel ch0; struct smd_half_channel ch0;
struct smd_half_channel ch1; struct smd_half_channel ch1;
}; };
struct smd_channel { struct smd_channel {
volatile struct smd_half_channel *send; volatile struct smd_half_channel *send;
...@@ -334,4 +328,6 @@ void *smem_find(unsigned id, unsigned size); ...@@ -334,4 +328,6 @@ void *smem_find(unsigned id, unsigned size);
void *smem_item(unsigned id, unsigned *size); void *smem_item(unsigned id, unsigned *size);
uint32_t raw_smsm_get_state(enum smsm_state_item item); uint32_t raw_smsm_get_state(enum smsm_state_item item);
extern void msm_init_last_radio_log(struct module *);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment