n2_crypto: Fix build after of_device/of_platform_driver changes. (ff6c7341) · Commits · e / devices / android_kernel_teracube_2e

drivers/crypto/n2_core.c

+16 −10

Original line number	Diff line number	Diff line
		@@ -1398,7 +1398,7 @@ static int find_devino_index(struct of_device dev, struct spu_mdesc_info ip,

		intr = ip->ino_table[i].intr;

		dev_intrs = of_get_property(dev->node, "interrupts", NULL);
		dev_intrs = of_get_property(dev->dev.of_node, "interrupts", NULL);
		if (!dev_intrs)
		return -ENODEV;

		@@ -1574,7 +1574,7 @@ static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc,
		id = mdesc_get_property(mdesc, tgt, "id", NULL);
		if (table[*id] != NULL) {
		dev_err(&dev->dev, "%s: SPU cpu slot already set.\n",
		dev->node->full_name);
		dev->dev.of_node->full_name);
		return -EINVAL;
		}
		cpu_set(*id, p->sharing);
		@@ -1595,7 +1595,7 @@ static int handle_exec_unit(struct spu_mdesc_info ip, struct list_head list,
		p = kzalloc(sizeof(struct spu_queue), GFP_KERNEL);
		if (!p) {
		dev_err(&dev->dev, "%s: Could not allocate SPU queue.\n",
		dev->node->full_name);
		dev->dev.of_node->full_name);
		return -ENOMEM;
		}

		@@ -1684,7 +1684,7 @@ static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc,
		const unsigned int *reg;
		u64 node;

		reg = of_get_property(dev->node, "reg", NULL);
		reg = of_get_property(dev->dev.of_node, "reg", NULL);
		if (!reg)
		return -ENODEV;

		@@ -1836,7 +1836,7 @@ static int __devinit n2_crypto_probe(struct of_device *dev,

		n2_spu_driver_version();

		full_name = dev->node->full_name;
		full_name = dev->dev.of_node->full_name;
		pr_info("Found N2CP at %s\n", full_name);

		np = alloc_n2cp();
		@@ -1948,7 +1948,7 @@ static int __devinit n2_mau_probe(struct of_device *dev,

		n2_spu_driver_version();

		full_name = dev->node->full_name;
		full_name = dev->dev.of_node->full_name;
		pr_info("Found NCP at %s\n", full_name);

		mp = alloc_ncp();
		@@ -2034,8 +2034,11 @@ static struct of_device_id n2_crypto_match[] = {
		MODULE_DEVICE_TABLE(of, n2_crypto_match);

		static struct of_platform_driver n2_crypto_driver = {
		.driver = {
		.name = "n2cp",
		.match_table = n2_crypto_match,
		.owner = THIS_MODULE,
		.of_match_table = n2_crypto_match,
		},
		.probe = n2_crypto_probe,
		.remove = __devexit_p(n2_crypto_remove),
		};
		@@ -2055,8 +2058,11 @@ static struct of_device_id n2_mau_match[] = {
		MODULE_DEVICE_TABLE(of, n2_mau_match);

		static struct of_platform_driver n2_mau_driver = {
		.driver = {
		.name = "ncp",
		.match_table = n2_mau_match,
		.owner = THIS_MODULE,
		.of_match_table = n2_mau_match,
		},
		.probe = n2_mau_probe,
		.remove = __devexit_p(n2_mau_remove),
		};