diff options
Diffstat (limited to 'drivers/spi')
-rw-r--r-- | drivers/spi/pxa2xx_spi.c | 4 | ||||
-rw-r--r-- | drivers/spi/spi_mpc83xx.c | 3 | ||||
-rw-r--r-- | drivers/spi/spi_s3c24xx.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index 29aec77f98be..77122edeb206 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
@@ -409,7 +409,7 @@ static int wait_dma_channel_stop(int channel) | |||
409 | return limit; | 409 | return limit; |
410 | } | 410 | } |
411 | 411 | ||
412 | static void dma_handler(int channel, void *data, struct pt_regs *regs) | 412 | static void dma_handler(int channel, void *data) |
413 | { | 413 | { |
414 | struct driver_data *drv_data = data; | 414 | struct driver_data *drv_data = data; |
415 | struct spi_message *msg = drv_data->cur_msg; | 415 | struct spi_message *msg = drv_data->cur_msg; |
@@ -667,7 +667,7 @@ static irqreturn_t interrupt_transfer(struct driver_data *drv_data) | |||
667 | return IRQ_HANDLED; | 667 | return IRQ_HANDLED; |
668 | } | 668 | } |
669 | 669 | ||
670 | static irqreturn_t ssp_int(int irq, void *dev_id, struct pt_regs *regs) | 670 | static irqreturn_t ssp_int(int irq, void *dev_id) |
671 | { | 671 | { |
672 | struct driver_data *drv_data = (struct driver_data *)dev_id; | 672 | struct driver_data *drv_data = (struct driver_data *)dev_id; |
673 | void *reg = drv_data->ioaddr; | 673 | void *reg = drv_data->ioaddr; |
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 5d92a7e5cb41..ff0b04895db0 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
@@ -296,8 +296,7 @@ static int mpc83xx_spi_bufs(struct spi_device *spi, struct spi_transfer *t) | |||
296 | return t->len - mpc83xx_spi->count; | 296 | return t->len - mpc83xx_spi->count; |
297 | } | 297 | } |
298 | 298 | ||
299 | irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data, | 299 | irqreturn_t mpc83xx_spi_irq(s32 irq, void *context_data) |
300 | struct pt_regs * ptregs) | ||
301 | { | 300 | { |
302 | struct mpc83xx_spi *mpc83xx_spi = context_data; | 301 | struct mpc83xx_spi *mpc83xx_spi = context_data; |
303 | u32 event; | 302 | u32 event; |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 20eb6e95a3a0..2ebe1fc4c398 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
@@ -196,7 +196,7 @@ static int s3c24xx_spi_txrx(struct spi_device *spi, struct spi_transfer *t) | |||
196 | return hw->count; | 196 | return hw->count; |
197 | } | 197 | } |
198 | 198 | ||
199 | static irqreturn_t s3c24xx_spi_irq(int irq, void *dev, struct pt_regs *regs) | 199 | static irqreturn_t s3c24xx_spi_irq(int irq, void *dev) |
200 | { | 200 | { |
201 | struct s3c24xx_spi *hw = dev; | 201 | struct s3c24xx_spi *hw = dev; |
202 | unsigned int spsta = readb(hw->regs + S3C2410_SPSTA); | 202 | unsigned int spsta = readb(hw->regs + S3C2410_SPSTA); |