Commit e393cc4e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'scmi-fixes-5.13' of... 

Merge tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into arm/fixes

ARM SCMI fixes for v5.13

A fix for very old possible ternary operation sign extention bug in the old
ARM SCPI firmware driver and a cleanup to remove duplicate structure declartion
in SCMI driver.

* tag 'scmi-fixes-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  firmware: arm_scmi: Remove duplicate declaration of struct scmi_protocol_handle
  firmware: arm_scpi: Prevent the ternary sign expansion bug

Link: https://lore.kernel.org/r/20210428093148.flrcowzr2dsj7byz@bogus


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 774cda6f 03f840c4

drivers/firmware/arm_scmi/notify.h

+0 −2
Original line number Diff line number Diff line
@@ -79,8 +79,6 @@ struct scmi_protocol_events { 


int scmi_notification_init(struct scmi_handle *handle);

void scmi_notification_exit(struct scmi_handle *handle);



struct scmi_protocol_handle;

int scmi_register_protocol_events(const struct scmi_handle *handle, u8 proto_id,

				  const struct scmi_protocol_handle *ph,

				  const struct scmi_protocol_events *ee);

drivers/firmware/arm_scpi.c

+3 −1
Original line number Diff line number Diff line
@@ -552,8 +552,10 @@ static unsigned long scpi_clk_get_val(u16 clk_id) 


	ret = scpi_send_message(CMD_GET_CLOCK_VALUE, &le_clk_id,

				sizeof(le_clk_id), &rate, sizeof(rate));

	if (ret)

		return 0;



	return ret ? ret : le32_to_cpu(rate);

	return le32_to_cpu(rate);

}



static int scpi_clk_set_val(u16 clk_id, unsigned long rate)