powerpc/5200: Bring the legacy fsl_spi_platform_data hooks back
authorAnton Vorontsov <avorontsov@ru.mvista.com>
Thu, 16 Apr 2009 15:58:44 +0000 (09:58 -0600)
committerGrant Likely <grant.likely@secretlab.ca>
Thu, 16 Apr 2009 15:58:44 +0000 (09:58 -0600)
In commit 364fdbc00fbdd409ade63500710123fe323aa164 ("spi_mpc83xx:
rework chip selects handling"), I merged activate_cs and deactivate_cs
hooks into cs_control, but I overlooked that mpc52xx_psc_spi driver
is using these hooks too. And that resulted in the following build
failure:

CC      drivers/spi/mpc52xx_psc_spi.o
drivers/spi/mpc52xx_psc_spi.c: In function 'mpc52xx_psc_spi_do_probe':
drivers/spi/mpc52xx_psc_spi.c:398: error: 'struct fsl_spi_platform_data'
has no member named 'activate_cs'
drivers/spi/mpc52xx_psc_spi.c:399: error: 'struct fsl_spi_platform_data'
has no member named 'deactivate_cs'
make[2]: *** [drivers/spi/mpc52xx_psc_spi.o] Error 1

This patch simply adds the legacy hooks back for 2.6.30, and for
2.6.31 we'll convert the driver to ->cs_control.

Reported-by: Subrata Modak <subrata@linux.vnet.ibm.com>
Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
include/linux/fsl_devices.h

index f2a78b5e8b5509be63ce810beb661af38f3d9e5b..0cde1806cfabad0ec8e4318204e88a68527b3945 100644 (file)
@@ -83,6 +83,10 @@ struct fsl_spi_platform_data {
        u16     max_chipselect;
        void    (*cs_control)(struct spi_device *spi, bool on);
        u32     sysclk;
+
+       /* Legacy hooks, used by mpc52xx_psc_spi driver. */
+       void    (*activate_cs)(u8 cs, u8 polarity);
+       void    (*deactivate_cs)(u8 cs, u8 polarity);
 };
 
 struct mpc8xx_pcmcia_ops {