msm: board: Clean up device declarations
Add 'static' to device declarations within the 8660 and
8960 board files.
Change-Id: I3435fbda413bb21fc0b68a9202d6b45db8b5249e
Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm8960-camera.c b/arch/arm/mach-msm/board-msm8960-camera.c
index a9c62e0..5384888 100644
--- a/arch/arm/mach-msm/board-msm8960-camera.c
+++ b/arch/arm/mach-msm/board-msm8960-camera.c
@@ -191,7 +191,7 @@
#define VFE_CAMIF_TIMER1_GPIO 2
#define VFE_CAMIF_TIMER2_GPIO 3
#define VFE_CAMIF_TIMER3_GPIO_INT 4
-struct msm_camera_sensor_strobe_flash_data strobe_flash_xenon = {
+static struct msm_camera_sensor_strobe_flash_data strobe_flash_xenon = {
.flash_trigger = VFE_CAMIF_TIMER2_GPIO,
.flash_charge = VFE_CAMIF_TIMER1_GPIO,
.flash_charge_done = VFE_CAMIF_TIMER3_GPIO_INT,
@@ -345,7 +345,7 @@
.name = "msm_camera",
};
-struct msm_camera_device_platform_data msm_camera_csi_device_data[] = {
+static struct msm_camera_device_platform_data msm_camera_csi_device_data[] = {
{
.ioclk.mclk_clk_rate = 24000000,
.ioclk.vfe_clk_rate = 228570000,
@@ -403,7 +403,7 @@
#endif
};
-struct platform_device msm8960_camera_sensor_imx074 = {
+static struct platform_device msm8960_camera_sensor_imx074 = {
.name = "msm_camera_imx074",
.dev = {
.platform_data = &msm_camera_sensor_imx074_data,
@@ -433,7 +433,7 @@
.camera_type = FRONT_CAMERA_2D,
};
-struct platform_device msm8960_camera_sensor_ov2720 = {
+static struct platform_device msm8960_camera_sensor_ov2720 = {
.name = "msm_camera_ov2720",
.dev = {
.platform_data = &msm_camera_sensor_ov2720_data,
diff --git a/arch/arm/mach-msm/board-msm8960-display.c b/arch/arm/mach-msm/board-msm8960-display.c
index fb14c86..2acca7e 100644
--- a/arch/arm/mach-msm/board-msm8960-display.c
+++ b/arch/arm/mach-msm/board-msm8960-display.c
@@ -525,14 +525,14 @@
#endif
#ifdef CONFIG_FB_MSM_HDMI_AS_PRIMARY
-int mdp_core_clk_rate_table[] = {
+static int mdp_core_clk_rate_table[] = {
200000000,
200000000,
200000000,
200000000,
};
#else
-int mdp_core_clk_rate_table[] = {
+static int mdp_core_clk_rate_table[] = {
85330000,
85330000,
160000000,
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index ac58900..89bdcf8 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -197,7 +197,7 @@
.pull = GPIOMUX_PULL_KEEPER,
};
-struct msm_gpiomux_config msm8960_gpiomux_configs[NR_GPIO_IRQS] = {
+static struct msm_gpiomux_config msm8960_gpiomux_configs[NR_GPIO_IRQS] = {
#if defined(CONFIG_KS8851) || defined(CONFIG_KS8851_MODULE)
{
.gpio = KS8851_IRQ_GPIO,
@@ -675,7 +675,7 @@
},
};
-struct platform_device msm_device_dspcrashd_8960 = {
+static struct platform_device msm_device_dspcrashd_8960 = {
.name = "msm_dspcrashd",
.num_resources = ARRAY_SIZE(resources_dspcrashd_8960),
.resource = resources_dspcrashd_8960,
@@ -727,7 +727,7 @@
}
#ifdef CONFIG_ION_MSM
-struct ion_platform_data ion_pdata = {
+static struct ion_platform_data ion_pdata = {
.nr = MSM_ION_HEAP_NUM,
.heaps = {
{
@@ -759,7 +759,7 @@
}
};
-struct platform_device ion_dev = {
+static struct platform_device ion_dev = {
.name = "ion-msm",
.id = 1,
.dev = { .platform_data = &ion_pdata },
@@ -1212,7 +1212,7 @@
.mdm_version = "2.5",
};
-struct platform_device mdm_device = {
+static struct platform_device mdm_device = {
.name = "mdm2_modem",
.id = -1,
.num_resources = ARRAY_SIZE(mdm_resources),
@@ -1451,7 +1451,7 @@
{TLMM_PULL_SDC3_DATA, GPIO_CFG_PULL_UP}
};
-struct msm_mmc_pad_pull_data mmc_pad_pull_data[MAX_SDCC_CONTROLLER] = {
+static struct msm_mmc_pad_pull_data mmc_pad_pull_data[MAX_SDCC_CONTROLLER] = {
[SDCC1] = {
.on = sdc1_pad_pull_on_cfg,
.off = sdc1_pad_pull_off_cfg,
@@ -1464,7 +1464,7 @@
},
};
-struct msm_mmc_pad_drv_data mmc_pad_drv_data[MAX_SDCC_CONTROLLER] = {
+static struct msm_mmc_pad_drv_data mmc_pad_drv_data[MAX_SDCC_CONTROLLER] = {
[SDCC1] = {
.on = sdc1_pad_drv_on_cfg,
.off = sdc1_pad_drv_off_cfg,
@@ -1477,7 +1477,7 @@
},
};
-struct msm_mmc_pad_data mmc_pad_data[MAX_SDCC_CONTROLLER] = {
+static struct msm_mmc_pad_data mmc_pad_data[MAX_SDCC_CONTROLLER] = {
[SDCC1] = {
.pull = &mmc_pad_pull_data[SDCC1],
.drv = &mmc_pad_drv_data[SDCC1]
@@ -1488,7 +1488,7 @@
},
};
-struct msm_mmc_pin_data mmc_slot_pin_data[MAX_SDCC_CONTROLLER] = {
+static struct msm_mmc_pin_data mmc_slot_pin_data[MAX_SDCC_CONTROLLER] = {
[SDCC1] = {
.pad_data = &mmc_pad_data[SDCC1],
},
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index c22d54c..d713b5e 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -144,6 +144,10 @@
#define DSPS_PIL_GENERIC_NAME "dsps"
#define DSPS_PIL_FLUID_NAME "dsps_fluid"
+#ifdef CONFIG_ION_MSM
+static struct platform_device ion_dev;
+#endif
+
enum {
GPIO_EXPANDER_IRQ_BASE = PM8901_IRQ_BASE + NR_PMIC8901_IRQS,
GPIO_EXPANDER_GPIO_BASE = PM8901_GPIO_BASE + PM8901_MPPS,
@@ -1523,7 +1527,7 @@
#endif
-
+
#ifdef CONFIG_MSM_VPE
static struct resource msm_vpe_resources[] = {
{
@@ -5158,7 +5162,7 @@
};
#ifdef CONFIG_ION_MSM
-struct ion_platform_data ion_pdata = {
+static struct ion_platform_data ion_pdata = {
.nr = MSM_ION_HEAP_NUM,
.heaps = {
{
@@ -5197,7 +5201,7 @@
}
};
-struct platform_device ion_dev = {
+static struct platform_device ion_dev = {
.name = "ion-msm",
.id = 1,
.dev = { .platform_data = &ion_pdata },
diff --git a/arch/arm/mach-msm/devices.h b/arch/arm/mach-msm/devices.h
index a95d0b6..24a6cc2 100644
--- a/arch/arm/mach-msm/devices.h
+++ b/arch/arm/mach-msm/devices.h
@@ -199,7 +199,6 @@
extern struct platform_device led_pdev;
-extern struct platform_device ion_dev;
extern struct platform_device msm_rpm_device;
extern struct platform_device msm_rpm_stat_device;
extern struct platform_device msm_device_rng;