Merge "char: virtio_fastrpc: Move PM notifier to driver probe" (cf00bfe4) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/char/virtio_fastrpc.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -2338,6 +2338,12 @@ static int virt_fastrpc_probe(struct virtio_device *vdev)
		if (IS_ERR_OR_NULL(secure_dev))
		goto device_create_bail;

		err = register_pm_notifier(&virtio_fastrpc_pm_nb);
		if (err) {
		pr_err("virtio_fastrpc: power state notifier error\n");
		goto device_create_bail;
		}

		virtio_device_ready(vdev);

		/* set up the receive buffers */
		@@ -2381,6 +2387,7 @@ static void virt_fastrpc_remove(struct virtio_device *vdev)
		{
		struct fastrpc_apps *me = &gfa;

		unregister_pm_notifier(&virtio_fastrpc_pm_nb);
		device_destroy(me->class, MKDEV(MAJOR(me->dev_no), MINOR_NUM_DEV));
		device_destroy(me->class, MKDEV(MAJOR(me->dev_no),
		MINOR_NUM_SECURE_DEV));
		@@ -2418,12 +2425,6 @@ static struct virtio_driver virtio_fastrpc_driver = {

		static int __init virtio_fastrpc_init(void)
		{
		int ret;

		ret = register_pm_notifier(&virtio_fastrpc_pm_nb);
		if (ret)
		pr_err("virtio_fastrpc: power state notif error\n");

		return register_virtio_driver(&virtio_fastrpc_driver);
		}