Skip to content

Commit 7c33278

Browse files
beanhuogregkh
authored andcommitted
scsi: ufs: delete redundant function ufshcd_def_desc_sizes()
[ Upstream commit 059efd8 ] 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: a4b0e8a(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: Sasha Levin <sashal@kernel.org>
1 parent 7139477 commit 7c33278

1 file changed

Lines changed: 1 addition & 14 deletions

File tree

drivers/scsi/ufs/ufshcd.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6779,23 +6779,13 @@ static void ufshcd_init_desc_sizes(struct ufs_hba *hba)
67796779
&hba->desc_size.geom_desc);
67806780
if (err)
67816781
hba->desc_size.geom_desc = QUERY_DESC_GEOMETRY_DEF_SIZE;
6782+
67826783
err = ufshcd_read_desc_length(hba, QUERY_DESC_IDN_HEALTH, 0,
67836784
&hba->desc_size.hlth_desc);
67846785
if (err)
67856786
hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE;
67866787
}
67876788

6788-
static void ufshcd_def_desc_sizes(struct ufs_hba *hba)
6789-
{
6790-
hba->desc_size.dev_desc = QUERY_DESC_DEVICE_DEF_SIZE;
6791-
hba->desc_size.pwr_desc = QUERY_DESC_POWER_DEF_SIZE;
6792-
hba->desc_size.interc_desc = QUERY_DESC_INTERCONNECT_DEF_SIZE;
6793-
hba->desc_size.conf_desc = QUERY_DESC_CONFIGURATION_DEF_SIZE;
6794-
hba->desc_size.unit_desc = QUERY_DESC_UNIT_DEF_SIZE;
6795-
hba->desc_size.geom_desc = QUERY_DESC_GEOMETRY_DEF_SIZE;
6796-
hba->desc_size.hlth_desc = QUERY_DESC_HEALTH_DEF_SIZE;
6797-
}
6798-
67996789
static struct ufs_ref_clk ufs_ref_clk_freqs[] = {
68006790
{19200000, REF_CLK_FREQ_19_2_MHZ},
68016791
{26000000, REF_CLK_FREQ_26_MHZ},
@@ -8283,9 +8273,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
82838273
hba->mmio_base = mmio_base;
82848274
hba->irq = irq;
82858275

8286-
/* Set descriptor lengths to specification defaults */
8287-
ufshcd_def_desc_sizes(hba);
8288-
82898276
err = ufshcd_hba_init(hba);
82908277
if (err)
82918278
goto out_error;

0 commit comments

Comments
 (0)