Unverified Commit e0d394e4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 4ddb1bf1 5acf07ff

drivers/soc/apple/rtkit.c

+4 −3
Original line number Diff line number Diff line
@@ -926,8 +926,10 @@ int apple_rtkit_wake(struct apple_rtkit *rtk) 
}

EXPORT_SYMBOL_GPL(apple_rtkit_wake);



static void apple_rtkit_free(struct apple_rtkit *rtk)

static void apple_rtkit_free(void *data)

{

	struct apple_rtkit *rtk = data;



	mbox_free_channel(rtk->mbox_chan);

	destroy_workqueue(rtk->wq);
@@ -950,8 +952,7 @@ struct apple_rtkit *devm_apple_rtkit_init(struct device *dev, void *cookie, 
	if (IS_ERR(rtk))

		return rtk;



	ret = devm_add_action_or_reset(dev, (void (*)(void *))apple_rtkit_free,

				       rtk);

	ret = devm_add_action_or_reset(dev, apple_rtkit_free, rtk);

	if (ret)

		return ERR_PTR(ret);

drivers/soc/apple/sart.c

+6 −1
Original line number Diff line number Diff line
@@ -164,6 +164,11 @@ static int apple_sart_probe(struct platform_device *pdev) 
	return 0;

}



static void apple_sart_put_device(void *dev)

{

	put_device(dev);

}



struct apple_sart *devm_apple_sart_get(struct device *dev)

{

	struct device_node *sart_node;
@@ -187,7 +192,7 @@ struct apple_sart *devm_apple_sart_get(struct device *dev) 
		return ERR_PTR(-EPROBE_DEFER);

	}



	ret = devm_add_action_or_reset(dev, (void (*)(void *))put_device,

	ret = devm_add_action_or_reset(dev, apple_sart_put_device,

				       &sart_pdev->dev);

	if (ret)

		return ERR_PTR(ret);