spi: sirf: account for const type of of_device_id.data

[linux-2.6-block.git] / drivers / spi / spi-sirf.c

diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index bbb1a275f718132b59caa77e03cb64a559f3f60d..f009d76f96b1d9ed880817c4168b1fcfa98ea8fe 100644 (file)
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -1072,7 +1072,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
        struct sirfsoc_spi *sspi;
        struct spi_master *master;
        struct resource *mem_res;
-       struct sirf_spi_comp_data *spi_comp_data;
+       const struct sirf_spi_comp_data *spi_comp_data;
        int irq;
        int ret;
        const struct of_device_id *match;
@@ -1092,7 +1092,7 @@ static int spi_sirfsoc_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, master);
        sspi = spi_master_get_devdata(master);
        sspi->fifo_full_offset = ilog2(sspi->fifo_size);
-       spi_comp_data = (struct sirf_spi_comp_data *)match->data;
+       spi_comp_data = match->data;
        sspi->regs = spi_comp_data->regs;
        sspi->type = spi_comp_data->type;
        sspi->fifo_level_chk_mask = (sspi->fifo_size / 4) - 1;