diff options
author | Heiner Kallweit <hkallweit1@gmail.com> | 2014-12-03 01:56:17 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-03 08:05:47 -0500 |
commit | c592becbe704127ef0b89233ff7f285637491154 (patch) | |
tree | cca527460f97f6879e7eb73d010faccf77cd3a2d /drivers/spi/spi-fsl-lib.h | |
parent | f114040e3ea6e07372334ade75d1ee0775c355e1 (diff) |
spi: fsl-(e)spi: migrate to generic master queueing
Migrates the fsl-(e)spi driver to use the generic master queuing.
Avoids the "master is unqueued, this is deprecated" warning.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-fsl-lib.h')
-rw-r--r-- | drivers/spi/spi-fsl-lib.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/spi/spi-fsl-lib.h b/drivers/spi/spi-fsl-lib.h index 2fcbfd01d109..b4ed04e8862f 100644 --- a/drivers/spi/spi-fsl-lib.h +++ b/drivers/spi/spi-fsl-lib.h | |||
@@ -55,7 +55,6 @@ struct mpc8xxx_spi { | |||
55 | u32(*get_tx) (struct mpc8xxx_spi *); | 55 | u32(*get_tx) (struct mpc8xxx_spi *); |
56 | 56 | ||
57 | /* hooks for different controller driver */ | 57 | /* hooks for different controller driver */ |
58 | void (*spi_do_one_msg) (struct spi_message *m); | ||
59 | void (*spi_remove) (struct mpc8xxx_spi *mspi); | 58 | void (*spi_remove) (struct mpc8xxx_spi *mspi); |
60 | 59 | ||
61 | unsigned int count; | 60 | unsigned int count; |
@@ -78,12 +77,6 @@ struct mpc8xxx_spi { | |||
78 | int bits_per_word, int msb_first); | 77 | int bits_per_word, int msb_first); |
79 | #endif | 78 | #endif |
80 | 79 | ||
81 | struct workqueue_struct *workqueue; | ||
82 | struct work_struct work; | ||
83 | |||
84 | struct list_head queue; | ||
85 | spinlock_t lock; | ||
86 | |||
87 | struct completion done; | 80 | struct completion done; |
88 | }; | 81 | }; |
89 | 82 | ||
@@ -123,9 +116,8 @@ extern struct mpc8xxx_spi_probe_info *to_of_pinfo( | |||
123 | struct fsl_spi_platform_data *pdata); | 116 | struct fsl_spi_platform_data *pdata); |
124 | extern int mpc8xxx_spi_bufs(struct mpc8xxx_spi *mspi, | 117 | extern int mpc8xxx_spi_bufs(struct mpc8xxx_spi *mspi, |
125 | struct spi_transfer *t, unsigned int len); | 118 | struct spi_transfer *t, unsigned int len); |
126 | extern int mpc8xxx_spi_transfer(struct spi_device *spi, struct spi_message *m); | ||
127 | extern const char *mpc8xxx_spi_strmode(unsigned int flags); | 119 | extern const char *mpc8xxx_spi_strmode(unsigned int flags); |
128 | extern int mpc8xxx_spi_probe(struct device *dev, struct resource *mem, | 120 | extern void mpc8xxx_spi_probe(struct device *dev, struct resource *mem, |
129 | unsigned int irq); | 121 | unsigned int irq); |
130 | extern int mpc8xxx_spi_remove(struct device *dev); | 122 | extern int mpc8xxx_spi_remove(struct device *dev); |
131 | extern int of_mpc8xxx_spi_probe(struct platform_device *ofdev); | 123 | extern int of_mpc8xxx_spi_probe(struct platform_device *ofdev); |