From mboxrd@z Thu Jan 1 00:00:00 1970 From: Magnus Damm Date: Fri, 02 Oct 2009 02:22:32 +0000 Subject: [PATCH 03/07] mmc: Remove const from tmio-mmc platform data Message-Id: <20091002022232.8215.10549.sendpatchset@rxone.opensource.se> List-Id: References: <20091002022158.8215.58317.sendpatchset@rxone.opensource.se> In-Reply-To: <20091002022158.8215.58317.sendpatchset@rxone.opensource.se> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org Cc: akpm@linux-foundation.org, linux-mmc@vger.kernel.org, ian@mnementh.co.uk, lethal@linux-sh.org, Magnus Damm , g.liakhovetski@gmx.de From: Magnus Damm Remove const from the hclk member of the tmio-mmc platform data. This to allow assigning a value dynamically to the platform data in the SuperH Mobile SDHI driver. Signed-off-by: Magnus Damm --- Depends on the SuperH Mobile SDHI driver. drivers/mfd/sh_mobile_sdhi.c | 4 +--- include/linux/mfd/tmio.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) --- 0008/drivers/mfd/sh_mobile_sdhi.c +++ work/drivers/mfd/sh_mobile_sdhi.c 2009-10-02 09:58:40.000000000 +0900 @@ -84,9 +84,7 @@ static int __init sh_mobile_sdhi_probe(s } clk_enable(priv->clk); - - /* FIXME: silly const unsigned int hclk */ - *(unsigned int *)&priv->mmc_data.hclk = clk_get_rate(priv->clk); + priv->mmc_data.hclk = clk_get_rate(priv->clk); memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc)); priv->cell_mmc.driver_data = &priv->mmc_data; --- 0002/include/linux/mfd/tmio.h +++ work/include/linux/mfd/tmio.h 2009-10-02 09:55:50.000000000 +0900 @@ -53,7 +53,7 @@ void tmio_core_mmc_clk_div(void __iomem * data for the MMC controller */ struct tmio_mmc_data { - const unsigned int hclk; + unsigned int hclk; void (*set_pwr)(struct platform_device *host, int state); void (*set_no_clk_div)(struct platform_device *host, int state); };