diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index bde3a04207ea..97d30d57ec21 100644
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -7944,26 +7944,12 @@ static int ufshcd_reset_and_restore(struct ufs_hba *hba)
 		err = ufshcd_detect_device(hba);
 	} while (err && --retries);
 
-<<<<<<< HEAD
 	/*
 	 * There is no point proceeding even after failing
 	 * to recover after multiple retries.
 	 */
 	if (err && ufshcd_is_embedded_dev(hba))
 		BUG();
-
-	/*
-	 * After reset the door-bell might be cleared, complete
-	 * outstanding requests in s/w here.
-	 */
-	spin_lock_irqsave(hba->host->host_lock, flags);
-	ufshcd_transfer_req_compl(hba);
-	ufshcd_tmc_handler(hba);
-	spin_unlock_irqrestore(hba->host->host_lock, flags);
-
-=======
->>>>>>> v4.14.172
-	return err;
 }
 
 /**
diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h
index 9d35e40dcf36..5a4cda8fe6c3 100644
--- a/drivers/scsi/ufs/ufshcd.h
+++ b/drivers/scsi/ufs/ufshcd.h
@@ -936,7 +936,6 @@ struct ufs_hba {
 	bool force_host_reset;
 	bool auto_h8_err;
 	struct ufs_stats ufs_stats;
-	bool silence_err_logs;
 
 	/* Device management request data */
 	struct ufs_dev_cmd dev_cmd;
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 09fab48fba76..8e81f3a6603d 100644
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -26,7 +26,7 @@
 #include "u_os_desc.h"
 #undef dev_dbg
 #define dev_dbg dev_info
-#undef pr_debug 
+#undef pr_debug
 #define pr_debug pr_info
 /**
  * struct usb_os_string - represents OS String to be reported by a gadget
@@ -580,11 +580,7 @@ static u8 encode_bMaxPower(enum usb_device_speed speed,
 	default:
 		/* only SuperSpeed and faster support > 500mA */
 		return DIV_ROUND_UP(min(val, 500U), 2);
-	}
-
-	if (speed < USB_SPEED_SUPER)
-		return DIV_ROUND_UP(val, 8);
-	else
+	}	
 }
 
 static int config_buf(struct usb_configuration *config,