spi: s3c64xx: fix conflict during updating 4.14.113

Change-Id: I092efcf156874612848f5e40659025a8c4ba5f7f
Signed-off-by: Youngmin Nam <youngmin.nam@samsung.com>

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index c640da6efec6be9e4e3c3026340cee7e000de50c..754e2e337913011c9557903f4714fd2039e7b105 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1997,7 +1997,6 @@ static int s3c64xx_spi_resume_operation(struct device *dev)
 
        if (sci->domain == DOMAIN_TOP) {
 
-<<<<<<< HEAD
                /* Enable the clock */
 #ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
                exynos_update_ip_idle_status(sdd->idle_ip_index, 0);
@@ -2014,11 +2013,6 @@ static int s3c64xx_spi_resume_operation(struct device *dev)
                        exynos_usi_init(sdd);
                        s3c64xx_spi_hwinit(sdd, sdd->port_id);
                }
-=======
-       return spi_master_resume(master);
-}
-#endif /* CONFIG_PM_SLEEP */
->>>>>>> android-4.14-p
 
 #ifdef CONFIG_PM
                /* Disable the clock */
@@ -2074,14 +2068,8 @@ static int s3c64xx_spi_resume(struct device *dev)
        struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);
        struct s3c64xx_spi_info *sci = sdd->cntrlr_info;
 
-<<<<<<< HEAD
        if (sci->dma_mode != DMA_MODE)
                return 0;
-=======
-       s3c64xx_spi_hwinit(sdd, sdd->port_id);
-
-       return 0;
->>>>>>> android-4.14-p
 
        dev_dbg(dev, "spi resume is handled in device resume, dma mode = %d\n",
                        sci->dma_mode);