cg2900: Add pdata_size to mfd_cell

This patch adds the pdata_size parameter to the
MFD cells so that the correct amount of platform data is
copied when creating MFD devices.

ST-Ericsson ID: 352334
ST-Ericcson FOSS-OUT-ID: Trivial
ST-Ericsson Linux next: 274079
Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com>

Change-Id: I10f3146eac89d4e238d80829f8c209aaad909bd1
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/29818
Reviewed-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>
Tested-by: Par-Gunnar HJALMDAHL <par-gunnar.p.hjalmdahl@stericsson.com>

2 files changed, 32 insertions, 0 deletions

diff --git a/drivers/staging/cg2900/mfd/cg2900_chip.c b/drivers/staging/cg2900/mfd/cg2900_chip.c
index 9807b665efb..7b69a97285a 100644
--- a/drivers/staging/cg2900/mfd/cg2900_chip.c
+++ b/drivers/staging/cg2900/mfd/cg2900_chip.c
@@ -2943,46 +2943,57 @@ static struct mfd_cell cg2900_devs[] = {
 	{
 		.name = "cg2900-btcmd",
 		.platform_data = &btcmd_data,
+		.pdata_size = sizeof(btcmd_data),
 	},
 	{
 		.name = "cg2900-btacl",
 		.platform_data = &btacl_data,
+		.pdata_size = sizeof(btacl_data),
 	},
 	{
 		.name = "cg2900-btevt",
 		.platform_data = &btevt_data,
+		.pdata_size = sizeof(btevt_data),
 	},
 	{
 		.name = "cg2900-fm",
 		.platform_data = &fm_data,
+		.pdata_size = sizeof(fm_data),
 	},
 	{
 		.name = "cg2900-gnss",
 		.platform_data = &gnss_data,
+		.pdata_size = sizeof(gnss_data),
 	},
 	{
 		.name = "cg2900-debug",
 		.platform_data = &debug_data,
+		.pdata_size = sizeof(debug_data),
 	},
 	{
 		.name = "cg2900-stetools",
 		.platform_data = &ste_tools_data,
+		.pdata_size = sizeof(ste_tools_data),
 	},
 	{
 		.name = "cg2900-hcilogger",
 		.platform_data = &hci_logger_data,
+		.pdata_size = sizeof(hci_logger_data),
 	},
 	{
 		.name = "cg2900-core",
 		.platform_data = &core_data,
+		.pdata_size = sizeof(core_data),
 	},
 	{
 		.name = "cg2900-audiobt",
 		.platform_data = &audio_bt_data,
+		.pdata_size = sizeof(audio_bt_data),
 	},
 	{
 		.name = "cg2900-audiofm",
 		.platform_data = &audio_fm_data,
+		.pdata_size = sizeof(audio_fm_data),
 	},
 };
 
@@ -3065,56 +3076,67 @@ static struct mfd_cell cg2900_char_devs[] = {
 		.name = "cg2900-chardev",
 		.id = 0,
 		.platform_data = &char_btcmd_data,
+		.pdata_size = sizeof(char_btcmd_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 1,
 		.platform_data = &char_btacl_data,
+		.pdata_size = sizeof(char_btacl_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 2,
 		.platform_data = &char_btevt_data,
+		.pdata_size = sizeof(char_btevt_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 3,
 		.platform_data = &char_fm_data,
+		.pdata_size = sizeof(char_fm_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 4,
 		.platform_data = &char_gnss_data,
+		.pdata_size = sizeof(char_gnss_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 5,
 		.platform_data = &char_debug_data,
+		.pdata_size = sizeof(char_debug_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 6,
 		.platform_data = &char_ste_tools_data,
+		.pdata_size = sizeof(char_ste_tools_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 7,
 		.platform_data = &char_hci_logger_data,
+		.pdata_size = sizeof(char_hci_logger_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 8,
 		.platform_data = &char_core_data,
+		.pdata_size = sizeof(char_core_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 9,
 		.platform_data = &char_audio_bt_data,
+		.pdata_size = sizeof(char_audio_bt_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 10,
 		.platform_data = &char_audio_fm_data,
+		.pdata_size = sizeof(char_audio_fm_data),
 	},
 };
 
diff --git a/drivers/staging/cg2900/mfd/stlc2690_chip.c b/drivers/staging/cg2900/mfd/stlc2690_chip.c
index 3e394670f1f..a1167d9ece1 100644
--- a/drivers/staging/cg2900/mfd/stlc2690_chip.c
+++ b/drivers/staging/cg2900/mfd/stlc2690_chip.c
@@ -1294,22 +1294,27 @@ static struct mfd_cell stlc2690_devs[] = {
 	{
 		.name = "cg2900-btcmd",
 		.platform_data = &btcmd_data,
+		.pdata_size = sizeof(btcmd_data),
 	},
 	{
 		.name = "cg2900-btacl",
 		.platform_data = &btacl_data,
+		.pdata_size = sizeof(btacl_data),
 	},
 	{
 		.name = "cg2900-btevt",
 		.platform_data = &btevt_data,
+		.pdata_size = sizeof(btevt_data),
 	},
 	{
 		.name = "cg2900-hcilogger",
 		.platform_data = &hci_logger_data,
+		.pdata_size = sizeof(hci_logger_data),
 	},
 	{
 		.name = "cg2900-core",
 		.platform_data = &core_data,
+		.pdata_size = sizeof(core_data),
 	},
 };
 
@@ -1354,26 +1359,31 @@ static struct mfd_cell stlc2690_char_devs[] = {
 		.name = "cg2900-chardev",
 		.id = 0,
 		.platform_data = &char_btcmd_data,
+		.pdata_size = sizeof(char_btcmd_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 1,
 		.platform_data = &char_btacl_data,
+		.pdata_size = sizeof(char_btacl_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 2,
 		.platform_data = &char_btevt_data,
+		.pdata_size = sizeof(char_btevt_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 7,
 		.platform_data = &char_hci_logger_data,
+		.pdata_size = sizeof(char_hci_logger_data),
 	},
 	{
 		.name = "cg2900-chardev",
 		.id = 8,
 		.platform_data = &char_core_data,
+		.pdata_size = sizeof(char_core_data),
 	},
 };