diff options
author | Samuel Ortiz <sameo@linux.intel.com> | 2009-06-15 09:43:31 -0400 |
---|---|---|
committer | Samuel Ortiz <sameol@linux.intel.com> | 2009-06-17 13:41:52 -0400 |
commit | 4d3792e054f706f73837769a0e5607b3b7ad25a2 (patch) | |
tree | 42545bf01207d599ed531d2025156fe6114997c1 | |
parent | 09f05ce8512c9873bda7f76273708753fdc5c698 (diff) |
mfd: fix tmio related warnings
We can not have .driver_data as const since platform_set_drvdata() doesnt take
a const.
The hclk mmc_data field can be const though.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r-- | drivers/mfd/t7l66xb.c | 2 | ||||
-rw-r--r-- | drivers/mfd/tc6387xb.c | 2 | ||||
-rw-r--r-- | drivers/mfd/tc6393xb.c | 2 | ||||
-rw-r--r-- | include/linux/mfd/tmio.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 875f7a875734..0a255c1f1ce7 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c | |||
@@ -108,7 +108,7 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc) | |||
108 | 108 | ||
109 | /*--------------------------------------------------------------------------*/ | 109 | /*--------------------------------------------------------------------------*/ |
110 | 110 | ||
111 | static const struct tmio_mmc_data t7166xb_mmc_data = { | 111 | static struct tmio_mmc_data t7166xb_mmc_data = { |
112 | .hclk = 24000000, | 112 | .hclk = 24000000, |
113 | }; | 113 | }; |
114 | 114 | ||
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c index c3993ac20542..3280ab33f88a 100644 --- a/drivers/mfd/tc6387xb.c +++ b/drivers/mfd/tc6387xb.c | |||
@@ -75,7 +75,7 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc) | |||
75 | 75 | ||
76 | /*--------------------------------------------------------------------------*/ | 76 | /*--------------------------------------------------------------------------*/ |
77 | 77 | ||
78 | const static struct tmio_mmc_data tc6387xb_mmc_data = { | 78 | static struct tmio_mmc_data tc6387xb_mmc_data = { |
79 | .hclk = 24000000, | 79 | .hclk = 24000000, |
80 | }; | 80 | }; |
81 | 81 | ||
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index 9d2abb5d6e2c..1429a7341a9a 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c | |||
@@ -136,7 +136,7 @@ static int tc6393xb_nand_enable(struct platform_device *nand) | |||
136 | return 0; | 136 | return 0; |
137 | } | 137 | } |
138 | 138 | ||
139 | const static struct tmio_mmc_data tc6393xb_mmc_data = { | 139 | static struct tmio_mmc_data tc6393xb_mmc_data = { |
140 | .hclk = 24000000, | 140 | .hclk = 24000000, |
141 | }; | 141 | }; |
142 | 142 | ||
diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index c377118884e6..6b9c5d06690c 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h | |||
@@ -22,7 +22,7 @@ | |||
22 | * data for the MMC controller | 22 | * data for the MMC controller |
23 | */ | 23 | */ |
24 | struct tmio_mmc_data { | 24 | struct tmio_mmc_data { |
25 | unsigned int hclk; | 25 | const unsigned int hclk; |
26 | }; | 26 | }; |
27 | 27 | ||
28 | /* | 28 | /* |