diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-02 13:19:40 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2024-01-02 13:19:40 -0500 |
| commit | 9cc52627c702b73c633737db40914ab8fc467de8 (patch) | |
| tree | 50dedcb98dcd3c239cddcad006fe815f62046f94 /drivers/reset/hisilicon/hi6220_reset.c | |
| parent | 731859dde86e23b0f11e700431e460ea76769584 (diff) | |
| parent | aad86da229bc9d0390dc2c02eb0db9ab1f50d059 (diff) | |
Merge tag 'kvm-riscv-6.8-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.8 part #1
- KVM_GET_REG_LIST improvement for vector registers
- Generate ISA extension reg_list using macros in get-reg-list selftest
- Steal time account support along with selftest
Diffstat (limited to 'drivers/reset/hisilicon/hi6220_reset.c')
| -rw-r--r-- | drivers/reset/hisilicon/hi6220_reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/reset/hisilicon/hi6220_reset.c b/drivers/reset/hisilicon/hi6220_reset.c index 8d1fce18ded7..5c3267acd2b1 100644 --- a/drivers/reset/hisilicon/hi6220_reset.c +++ b/drivers/reset/hisilicon/hi6220_reset.c @@ -163,7 +163,7 @@ static int hi6220_reset_probe(struct platform_device *pdev) if (!data) return -ENOMEM; - type = (enum hi6220_reset_ctrl_type)of_device_get_match_data(dev); + type = (uintptr_t)of_device_get_match_data(dev); regmap = syscon_node_to_regmap(np); if (IS_ERR(regmap)) { |