Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a56e6a30 authored by Subhash Jadavani's avatar Subhash Jadavani
Browse files

scsi: ufs-qcom: remove androidboot.bootdevice check 



We were checking the "androidboot.bootdevice" kernel command line argument
to avoid probing the UFS during eMMC boot. This was good to have check but
not mandatory. Now that we may have 2 different instances of the UFS host
controller (one going to be attached with bootable embedded UFS device and
second one may be used to attach removable UFS device), having this hard
check would not allow the second host controller instance to be probed.
Hence this change removes androidboot.bootdevice check.

Change-Id: Ie0ad8df982eed39097618689f3f5a2099a2e83ca
Signed-off-by: default avatarSubhash Jadavani <subhashj@codeaurora.org>
parent 11a4004d

drivers/scsi/ufs/ufs-qcom.c

+0 −15
Original line number Diff line number Diff line
@@ -1820,18 +1820,6 @@ static void ufs_qcom_pm_qos_remove(struct ufs_qcom_host *host) 
}

#endif /* CONFIG_SMP */



#define	ANDROID_BOOT_DEV_MAX	30

static char android_boot_dev[ANDROID_BOOT_DEV_MAX];



#ifndef MODULE

static int __init get_android_boot_dev(char *str)

{

	strlcpy(android_boot_dev, str, ANDROID_BOOT_DEV_MAX);

	return 1;

}

__setup("androidboot.bootdevice=", get_android_boot_dev);

#endif



/*

 * ufs_qcom_parse_lpm - read from DTS whether LPM modes should be disabled.

 */
@@ -1862,9 +1850,6 @@ static int ufs_qcom_init(struct ufs_hba *hba) 
	struct ufs_qcom_host *host;

	struct resource *res;



	if (strlen(android_boot_dev) && strcmp(android_boot_dev, dev_name(dev)))

		return -ENODEV;



	host = devm_kzalloc(dev, sizeof(*host), GFP_KERNEL);

	if (!host) {

		err = -ENOMEM;