diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2020-10-29 14:08:40 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-10-29 14:08:40 -0700 |
| commit | 1c29d9899081d090cbe2aab128e527354af7f343 (patch) | |
| tree | 83e3376286d1a808d3f73276750b558776c272ac /drivers/firmware/arm_scmi/power.c | |
| parent | cd29296fdfca919590e4004a7e4905544f4c4a32 (diff) | |
| parent | 07e0887302450a62f51dba72df6afb5fabb23d1c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/firmware/arm_scmi/power.c')
| -rw-r--r-- | drivers/firmware/arm_scmi/power.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/firmware/arm_scmi/power.c b/drivers/firmware/arm_scmi/power.c index 46f213644c49..1f37258e9bee 100644 --- a/drivers/firmware/arm_scmi/power.c +++ b/drivers/firmware/arm_scmi/power.c @@ -184,7 +184,7 @@ static char *scmi_power_name_get(const struct scmi_handle *handle, u32 domain) return dom->name; } -static struct scmi_power_ops power_ops = { +static const struct scmi_power_ops power_ops = { .num_domains_get = scmi_power_num_domains_get, .name_get = scmi_power_name_get, .state_set = scmi_power_state_set, @@ -301,9 +301,4 @@ static int scmi_power_protocol_init(struct scmi_handle *handle) return 0; } -static int __init scmi_power_init(void) -{ - return scmi_protocol_register(SCMI_PROTOCOL_POWER, - &scmi_power_protocol_init); -} -subsys_initcall(scmi_power_init); +DEFINE_SCMI_PROTOCOL_REGISTER_UNREGISTER(SCMI_PROTOCOL_POWER, power) |