| From 18399f63fd6beed781d76657378991d9f6209a52 Mon Sep 17 00:00:00 2001 |
| From: Bean Huo <beanhuo@micron.com> |
| Date: Tue, 29 Oct 2019 14:22:45 +0000 |
| Subject: [PATCH] scsi: ufs: delete redundant function ufshcd_def_desc_sizes() |
| |
| commit 059efd847a4097c67817782d8ff65397e369e69b upstream. |
| |
| There is no need to call ufshcd_def_desc_sizes() in ufshcd_init(), since |
| descriptor lengths will be checked and initialized later in |
| ufshcd_init_desc_sizes(). |
| |
| Fixes: a4b0e8a4e92b1b(scsi: ufs: Factor out ufshcd_read_desc_param) |
| Link: https://lore.kernel.org/r/BN7PR08MB5684A3ACE214C3D4792CE729DB610@BN7PR08MB5684.namprd08.prod.outlook.com |
| Signed-off-by: Bean Huo <beanhuo@micron.com> |
| Acked-by: Avri Altman <avri.altman.wdc.com> |
| Reviewed-by: Can Guo <cang@codeaurora.org> |
| Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c |
| index 50f5f7298e65..c007a13106c6 100644 |
| --- a/drivers/scsi/ufs/ufshcd.c |
| +++ b/drivers/scsi/ufs/ufshcd.c |
| @@ -6708,23 +6708,13 @@ static void ufshcd_init_desc_sizes(struct ufs_hba *hba) |
| &hba->desc_size.geom_desc); |
| if (err) |
| hba->desc_size.geom_desc = QUERY_DESC_GEOMETRY_DEF_SIZE; |
| + |
| err = ufshcd_read_desc_length(hba, QUERY_DESC_IDN_HEALTH, 0, |
| &hba->desc_size.hlth_desc); |
| if (err) |
| hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; |
| } |
| |
| -static void ufshcd_def_desc_sizes(struct ufs_hba *hba) |
| -{ |
| - hba->desc_size.dev_desc = QUERY_DESC_DEVICE_DEF_SIZE; |
| - hba->desc_size.pwr_desc = QUERY_DESC_POWER_DEF_SIZE; |
| - hba->desc_size.interc_desc = QUERY_DESC_INTERCONNECT_DEF_SIZE; |
| - hba->desc_size.conf_desc = QUERY_DESC_CONFIGURATION_DEF_SIZE; |
| - hba->desc_size.unit_desc = QUERY_DESC_UNIT_DEF_SIZE; |
| - hba->desc_size.geom_desc = QUERY_DESC_GEOMETRY_DEF_SIZE; |
| - hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE; |
| -} |
| - |
| static struct ufs_ref_clk ufs_ref_clk_freqs[] = { |
| {19200000, REF_CLK_FREQ_19_2_MHZ}, |
| {26000000, REF_CLK_FREQ_26_MHZ}, |
| @@ -8205,9 +8195,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) |
| hba->mmio_base = mmio_base; |
| hba->irq = irq; |
| |
| - /* Set descriptor lengths to specification defaults */ |
| - ufshcd_def_desc_sizes(hba); |
| - |
| err = ufshcd_hba_init(hba); |
| if (err) |
| goto out_error; |
| -- |
| 2.7.4 |
| |
