Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'asahi-soc-rtkit-sart-6.2' of https://github.com/AsahiLinux/linux into soc/drivers

Apple SoC RTKit/SART updates for 6.2.

Just two minor correctness nits reported by the kernel test robot.

* tag 'asahi-soc-rtkit-sart-6.2' of https://github.com/AsahiLinux/linux:
soc: apple: rtkit: Stop casting function pointer signatures
soc: apple: sart: Stop casting function pointer signatures

Link: https://lore.kernel.org/r/57f84134-8645-35f6-2427-ee683800c413@marcan.st
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

+10 -4
+4 -3
drivers/soc/apple/rtkit.c
··· 926 926 } 927 927 EXPORT_SYMBOL_GPL(apple_rtkit_wake); 928 928 929 - static void apple_rtkit_free(struct apple_rtkit *rtk) 929 + static void apple_rtkit_free(void *data) 930 930 { 931 + struct apple_rtkit *rtk = data; 932 + 931 933 mbox_free_channel(rtk->mbox_chan); 932 934 destroy_workqueue(rtk->wq); 933 935 ··· 952 950 if (IS_ERR(rtk)) 953 951 return rtk; 954 952 955 - ret = devm_add_action_or_reset(dev, (void (*)(void *))apple_rtkit_free, 956 - rtk); 953 + ret = devm_add_action_or_reset(dev, apple_rtkit_free, rtk); 957 954 if (ret) 958 955 return ERR_PTR(ret); 959 956
+6 -1
drivers/soc/apple/sart.c
··· 164 164 return 0; 165 165 } 166 166 167 + static void apple_sart_put_device(void *dev) 168 + { 169 + put_device(dev); 170 + } 171 + 167 172 struct apple_sart *devm_apple_sart_get(struct device *dev) 168 173 { 169 174 struct device_node *sart_node; ··· 192 187 return ERR_PTR(-EPROBE_DEFER); 193 188 } 194 189 195 - ret = devm_add_action_or_reset(dev, (void (*)(void *))put_device, 190 + ret = devm_add_action_or_reset(dev, apple_sart_put_device, 196 191 &sart_pdev->dev); 197 192 if (ret) 198 193 return ERR_PTR(ret);