* [PATCH 1/5] arm: msm: smd: checkpatch clean up of smd/proc_comm
@ 2010-04-19 18:03 Daniel Walker
2010-04-20 5:18 ` Pavel Machek
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Walker @ 2010-04-19 18:03 UTC (permalink / raw)
To: linux-arm-msm; +Cc: dima, Daniel Walker
This cleans up coding style. There are no run time changes.
Change-Id: I160b827ba6f218f1080a3804694401bf6d69adf5
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
---
arch/arm/mach-msm/include/mach/msm_smd.h | 5 +++--
arch/arm/mach-msm/proc_comm.h | 4 ++--
arch/arm/mach-msm/smd.c | 8 ++------
arch/arm/mach-msm/smd_private.h | 24 ++++++++++--------------
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 2e56b82..7ed2939 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 2350765..0f5cdd3 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 2b40f2d..42b59c9 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -118,8 +118,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);
@@ -899,9 +897,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);
@@ -1051,8 +1049,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 2da758e..33a33f1 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
--
1.6.2.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/5] arm: msm: smd: checkpatch clean up of smd/proc_comm
2010-04-19 18:03 [PATCH 1/5] arm: msm: smd: checkpatch clean up of smd/proc_comm Daniel Walker
@ 2010-04-20 5:18 ` Pavel Machek
0 siblings, 0 replies; 2+ messages in thread
From: Pavel Machek @ 2010-04-20 5:18 UTC (permalink / raw)
To: Daniel Walker; +Cc: linux-arm-msm, dima
On Mon 2010-04-19 11:03:05, Daniel Walker wrote:
> This cleans up coding style. There are no run time changes.
>
> Change-Id: I160b827ba6f218f1080a3804694401bf6d69adf5
> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
ACK.
> ---
> arch/arm/mach-msm/include/mach/msm_smd.h | 5 +++--
> arch/arm/mach-msm/proc_comm.h | 4 ++--
> arch/arm/mach-msm/smd.c | 8 ++------
> arch/arm/mach-msm/smd_private.h | 24 ++++++++++--------------
> 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 2e56b82..7ed2939 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 2350765..0f5cdd3 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 2b40f2d..42b59c9 100644
> --- a/arch/arm/mach-msm/smd.c
> +++ b/arch/arm/mach-msm/smd.c
> @@ -118,8 +118,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);
> @@ -899,9 +897,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);
> @@ -1051,8 +1049,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 2da758e..33a33f1 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
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-20 5:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-04-19 18:03 [PATCH 1/5] arm: msm: smd: checkpatch clean up of smd/proc_comm Daniel Walker
2010-04-20 5:18 ` Pavel Machek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).