Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

[pandora-kernel.git] / drivers / spi / spi_mpc8xxx.c

diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 394b658..1fb2a6e 100644 (file)
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -163,11 +163,6 @@ struct mpc8xxx_spi {
        u32 tx_shift;           /* TX data reg shift when in qe mode */
 
        unsigned int flags;
        u32 tx_shift;           /* TX data reg shift when in qe mode */
 
        unsigned int flags;

-#define SPI_QE_CPU_MODE                (1 << 0) /* QE CPU ("PIO") mode */
-#define SPI_CPM_MODE           (1 << 1) /* CPM/QE ("DMA") mode */
-#define SPI_CPM1               (1 << 2) /* SPI unit is in CPM1 block */
-#define SPI_CPM2               (1 << 3) /* SPI unit is in CPM2 block */
-#define SPI_QE                 (1 << 4) /* SPI unit is in QE block */

 
        struct workqueue_struct *workqueue;
        struct work_struct work;
 
        struct workqueue_struct *workqueue;
        struct work_struct work;


@@ -1018,7 +1013,7 @@ mpc8xxx_spi_probe(struct device *dev, struct resource *mem, unsigned int irq)
 
        init_completion(&mpc8xxx_spi->done);
 
 
        init_completion(&mpc8xxx_spi->done);
 

-       mpc8xxx_spi->base = ioremap(mem->start, mem->end - mem->start + 1);
+       mpc8xxx_spi->base = ioremap(mem->start, resource_size(mem));

        if (mpc8xxx_spi->base == NULL) {
                ret = -ENOMEM;
                goto err_ioremap;
        if (mpc8xxx_spi->base == NULL) {
                ret = -ENOMEM;
                goto err_ioremap;


@@ -1361,7 +1356,7 @@ static int __devexit plat_mpc8xxx_spi_remove(struct platform_device *pdev)
 MODULE_ALIAS("platform:mpc8xxx_spi");
 static struct platform_driver mpc8xxx_spi_driver = {
        .probe = plat_mpc8xxx_spi_probe,
 MODULE_ALIAS("platform:mpc8xxx_spi");
 static struct platform_driver mpc8xxx_spi_driver = {
        .probe = plat_mpc8xxx_spi_probe,

-       .remove = __exit_p(plat_mpc8xxx_spi_remove),
+       .remove = __devexit_p(plat_mpc8xxx_spi_remove),

        .driver = {
                .name = "mpc8xxx_spi",
                .owner = THIS_MODULE,
        .driver = {
                .name = "mpc8xxx_spi",
                .owner = THIS_MODULE,