From: Martin K. Petersen Date: Fri, 10 Jan 2025 20:20:30 +0000 (-0500) Subject: Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca;p=users%2Fjedix%2Flinux-maple.git Merge branch '6.13/scsi-fixes' into 6.14/scsi-staging Pull in fixes branch to resolve merge conflict in ufs-qcom.c. Signed-off-by: Martin K. Petersen --- 8bf10dfd7d0d8c0e6cdda176c461b3c5eba022ca diff --cc drivers/ufs/host/ufs-qcom.c index eae8dfb8c91e7,91e94fe990b4a..23b9f6efa0475 --- a/drivers/ufs/host/ufs-qcom.c +++ b/drivers/ufs/host/ufs-qcom.c @@@ -1876,7 -1826,7 +1878,6 @@@ static const struct ufs_hba_variant_op .dbg_register_dump = ufs_qcom_dump_dbg_regs, .device_reset = ufs_qcom_device_reset, .config_scaling_param = ufs_qcom_config_scaling_param, - .reinit_notify = ufs_qcom_reinit_notify, - .program_key = ufs_qcom_ice_program_key, .mcq_config_resource = ufs_qcom_mcq_config_resource, .get_hba_mac = ufs_qcom_get_hba_mac, .op_runtime_config = ufs_qcom_op_runtime_config, diff --cc include/ufs/ufshcd.h index 4d9d9cf6ee463,74e5b9960c546..da0fa5c65081a --- a/include/ufs/ufshcd.h +++ b/include/ufs/ufshcd.h @@@ -324,9 -326,9 +326,8 @@@ struct ufs_pwr_mode_info * @phy_initialization: used to initialize phys * @device_reset: called to issue a reset pulse on the UFS device * @config_scaling_param: called to configure clock scaling parameters - * @program_key: program or evict an inline encryption key * @fill_crypto_prdt: initialize crypto-related fields in the PRDT * @event_notify: called to notify important events - * @reinit_notify: called to notify reinit of UFSHCD during max gear switch * @mcq_config_resource: called to configure MCQ platform resources * @get_hba_mac: reports maximum number of outstanding commands supported by * the controller. Should be implemented for UFSHCI 4.0 or later