Merge remote-tracking branch 'spi/topic/s3c24xx' into spi-next

diff --combined drivers/spi/spi-s3c24xx.c
index c9cfdfaf75238383ad436192fc8b8367507030b9,d39589dba5c185255052d30e2d6e27a8466d20f3..0dc32a11bd3cd9ac657f9330858e29398876d96e
--- 1/drivers/spi/spi-s3c24xx.c
--- 2/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@@ -280,7 -280,7 +280,7 @@@ static inline u32 ack_bit(unsigned int 
   * so the caller does not need to do anything more than start the transfer
   * as normal, since the IRQ will have been re-routed to the FIQ handler.
  */
- void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
+ static void s3c24xx_spi_tryfiq(struct s3c24xx_spi *hw)
  {
        struct pt_regs regs;
        enum spi_fiq_mode mode;
@@@ -524,7 -524,7 +524,7 @@@ static int s3c24xx_spi_probe(struct pla
        hw = spi_master_get_devdata(master);
        memset(hw, 0, sizeof(struct s3c24xx_spi));
  
 -      hw->master = spi_master_get(master);
 +      hw->master = master;
        hw->pdata = pdata = dev_get_platdata(&pdev->dev);
        hw->dev = &pdev->dev;