[COMMON] storage: fix conflict during updating 4.14.113

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

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index b99ad0fe5f38196526185e2b212062dd2343f54f..ed9d979d70e8de4d2280642916d11d71811c8658 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -1652,15 +1652,6 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit)
        u32 clk_en_a;
        u32 sdmmc_cmd_bits = SDMMC_CMD_UPD_CLK | SDMMC_CMD_PRV_DAT_WAIT;
 
-<<<<<<< HEAD
-=======
-       /* We must continue to set bit 28 in CMD until the change is complete */
-       if (host->state == STATE_WAITING_CMD11_DONE)
-               sdmmc_cmd_bits |= SDMMC_CMD_VOLT_SWITCH;
-
-       slot->mmc->actual_clock = 0;
-
->>>>>>> android-4.14-p
        if (!clock) {
                mci_writel(host, CLKENA, 0);
                mci_send_cmd(slot, sdmmc_cmd_bits, 0);

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index d55029a0eb98082786f0f99c9b9b18333da146ee..0385eab82787e676b4e5857d15c93cb5f29784bf 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3198,25 +3198,10 @@ static int sd_revalidate_disk(struct gendisk *disk)
        dev_max = min_not_zero(dev_max, sdkp->max_xfer_blocks);
        q->limits.max_dev_sectors = logical_to_sectors(sdp, dev_max);
 
-<<<<<<< HEAD
-       /*
-        * Determine the device's preferred I/O size for reads and writes
-        * unless the reported value is unreasonably small, large, or
-        * garbage.
-        */
-       if (sdkp->opt_xfer_blocks &&
-           sdkp->opt_xfer_blocks <= dev_max &&
-           sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
-               sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE)
-               rw_max = q->limits.io_opt =
-                       sdkp->opt_xfer_blocks * sdp->sector_size;
-       else
-=======
        if (sd_validate_opt_xfer_size(sdkp, dev_max)) {
                q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks);
                rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
        } else
->>>>>>> android-4.14-p
                rw_max = min_not_zero(logical_to_sectors(sdp, dev_max),
                                      (sector_t)BLK_DEF_MAX_SECTORS);
 

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index 4b7d944c516dbdd86c71bb608a05fa3bedb5b7b1..efb11b5fb852be6dfc1db24d39700f89990f4231 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -7501,20 +7501,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
        if (list_empty(head))
                goto out;
 
-<<<<<<< HEAD
        ufshcd_vops_pre_setup_clocks(hba, on);
-=======
-       /*
-        * vendor specific setup_clocks ops may depend on clocks managed by
-        * this standard driver hence call the vendor specific setup_clocks
-        * before disabling the clocks managed here.
-        */
-       if (!on) {
-               ret = ufshcd_vops_setup_clocks(hba, on, PRE_CHANGE);
-               if (ret)
-                       return ret;
-       }
->>>>>>> android-4.14-p
 
        list_for_each_entry(clki, head, list) {
                if (!IS_ERR_OR_NULL(clki->clk)) {
@@ -7540,20 +7527,7 @@ static int __ufshcd_setup_clocks(struct ufs_hba *hba, bool on,
                }
        }
 
-<<<<<<< HEAD
        ret = ufshcd_vops_setup_clocks(hba, on);
-=======
-       /*
-        * vendor specific setup_clocks ops may depend on clocks managed by
-        * this standard driver hence call the vendor specific setup_clocks
-        * after enabling the clocks managed here.
-        */
-       if (on) {
-               ret = ufshcd_vops_setup_clocks(hba, on, POST_CHANGE);
-               if (ret)
-                       return ret;
-       }
->>>>>>> android-4.14-p
 
 out:
        if (ret) {