diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-12 12:11:31 -0400 |
commit | 58d4ea65b98f154f3326b038eecda32f90b46ea8 (patch) | |
tree | 636aed413349dece12c08a4bd3d1fea0254976d8 /drivers/crypto/n2_core.c | |
parent | 26f0cf91813bdc8e61595f8ad6660251e2ee9cf6 (diff) | |
parent | fbe0f8348fd6c3d016a3f48756eb729b41a67c22 (diff) |
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
mmc_spi: Fix unterminated of_match_table
of/sparc: fix build regression from of_device changes
of/device: Replace struct of_device with struct platform_device
Diffstat (limited to 'drivers/crypto/n2_core.c')
-rw-r--r-- | drivers/crypto/n2_core.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 26af2dd5d83..88ee01510ec 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c | |||
@@ -1552,7 +1552,7 @@ static void __exit n2_unregister_algs(void) | |||
1552 | 1552 | ||
1553 | /* To map CWQ queues to interrupt sources, the hypervisor API provides | 1553 | /* To map CWQ queues to interrupt sources, the hypervisor API provides |
1554 | * a devino. This isn't very useful to us because all of the | 1554 | * a devino. This isn't very useful to us because all of the |
1555 | * interrupts listed in the of_device node have been translated to | 1555 | * interrupts listed in the device_node have been translated to |
1556 | * Linux virtual IRQ cookie numbers. | 1556 | * Linux virtual IRQ cookie numbers. |
1557 | * | 1557 | * |
1558 | * So we have to back-translate, going through the 'intr' and 'ino' | 1558 | * So we have to back-translate, going through the 'intr' and 'ino' |
@@ -1560,7 +1560,7 @@ static void __exit n2_unregister_algs(void) | |||
1560 | * 'interrupts' property entries, in order to to figure out which | 1560 | * 'interrupts' property entries, in order to to figure out which |
1561 | * devino goes to which already-translated IRQ. | 1561 | * devino goes to which already-translated IRQ. |
1562 | */ | 1562 | */ |
1563 | static int find_devino_index(struct of_device *dev, struct spu_mdesc_info *ip, | 1563 | static int find_devino_index(struct platform_device *dev, struct spu_mdesc_info *ip, |
1564 | unsigned long dev_ino) | 1564 | unsigned long dev_ino) |
1565 | { | 1565 | { |
1566 | const unsigned int *dev_intrs; | 1566 | const unsigned int *dev_intrs; |
@@ -1580,7 +1580,7 @@ static int find_devino_index(struct of_device *dev, struct spu_mdesc_info *ip, | |||
1580 | if (!dev_intrs) | 1580 | if (!dev_intrs) |
1581 | return -ENODEV; | 1581 | return -ENODEV; |
1582 | 1582 | ||
1583 | for (i = 0; i < dev->num_irqs; i++) { | 1583 | for (i = 0; i < dev->archdata.num_irqs; i++) { |
1584 | if (dev_intrs[i] == intr) | 1584 | if (dev_intrs[i] == intr) |
1585 | return i; | 1585 | return i; |
1586 | } | 1586 | } |
@@ -1588,7 +1588,7 @@ static int find_devino_index(struct of_device *dev, struct spu_mdesc_info *ip, | |||
1588 | return -ENODEV; | 1588 | return -ENODEV; |
1589 | } | 1589 | } |
1590 | 1590 | ||
1591 | static int spu_map_ino(struct of_device *dev, struct spu_mdesc_info *ip, | 1591 | static int spu_map_ino(struct platform_device *dev, struct spu_mdesc_info *ip, |
1592 | const char *irq_name, struct spu_queue *p, | 1592 | const char *irq_name, struct spu_queue *p, |
1593 | irq_handler_t handler) | 1593 | irq_handler_t handler) |
1594 | { | 1594 | { |
@@ -1603,7 +1603,7 @@ static int spu_map_ino(struct of_device *dev, struct spu_mdesc_info *ip, | |||
1603 | if (index < 0) | 1603 | if (index < 0) |
1604 | return index; | 1604 | return index; |
1605 | 1605 | ||
1606 | p->irq = dev->irqs[index]; | 1606 | p->irq = dev->archdata.irqs[index]; |
1607 | 1607 | ||
1608 | sprintf(p->irq_name, "%s-%d", irq_name, index); | 1608 | sprintf(p->irq_name, "%s-%d", irq_name, index); |
1609 | 1609 | ||
@@ -1736,7 +1736,7 @@ static void spu_list_destroy(struct list_head *list) | |||
1736 | * gathering cpu membership information. | 1736 | * gathering cpu membership information. |
1737 | */ | 1737 | */ |
1738 | static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc, | 1738 | static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc, |
1739 | struct of_device *dev, | 1739 | struct platform_device *dev, |
1740 | u64 node, struct spu_queue *p, | 1740 | u64 node, struct spu_queue *p, |
1741 | struct spu_queue **table) | 1741 | struct spu_queue **table) |
1742 | { | 1742 | { |
@@ -1763,7 +1763,7 @@ static int spu_mdesc_walk_arcs(struct mdesc_handle *mdesc, | |||
1763 | 1763 | ||
1764 | /* Process an 'exec-unit' MDESC node of type 'cwq'. */ | 1764 | /* Process an 'exec-unit' MDESC node of type 'cwq'. */ |
1765 | static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list, | 1765 | static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list, |
1766 | struct of_device *dev, struct mdesc_handle *mdesc, | 1766 | struct platform_device *dev, struct mdesc_handle *mdesc, |
1767 | u64 node, const char *iname, unsigned long q_type, | 1767 | u64 node, const char *iname, unsigned long q_type, |
1768 | irq_handler_t handler, struct spu_queue **table) | 1768 | irq_handler_t handler, struct spu_queue **table) |
1769 | { | 1769 | { |
@@ -1794,7 +1794,7 @@ static int handle_exec_unit(struct spu_mdesc_info *ip, struct list_head *list, | |||
1794 | return spu_map_ino(dev, ip, iname, p, handler); | 1794 | return spu_map_ino(dev, ip, iname, p, handler); |
1795 | } | 1795 | } |
1796 | 1796 | ||
1797 | static int spu_mdesc_scan(struct mdesc_handle *mdesc, struct of_device *dev, | 1797 | static int spu_mdesc_scan(struct mdesc_handle *mdesc, struct platform_device *dev, |
1798 | struct spu_mdesc_info *ip, struct list_head *list, | 1798 | struct spu_mdesc_info *ip, struct list_head *list, |
1799 | const char *exec_name, unsigned long q_type, | 1799 | const char *exec_name, unsigned long q_type, |
1800 | irq_handler_t handler, struct spu_queue **table) | 1800 | irq_handler_t handler, struct spu_queue **table) |
@@ -1855,7 +1855,7 @@ static int __devinit get_irq_props(struct mdesc_handle *mdesc, u64 node, | |||
1855 | } | 1855 | } |
1856 | 1856 | ||
1857 | static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, | 1857 | static int __devinit grab_mdesc_irq_props(struct mdesc_handle *mdesc, |
1858 | struct of_device *dev, | 1858 | struct platform_device *dev, |
1859 | struct spu_mdesc_info *ip, | 1859 | struct spu_mdesc_info *ip, |
1860 | const char *node_name) | 1860 | const char *node_name) |
1861 | { | 1861 | { |
@@ -2004,7 +2004,7 @@ static void __devinit n2_spu_driver_version(void) | |||
2004 | pr_info("%s", version); | 2004 | pr_info("%s", version); |
2005 | } | 2005 | } |
2006 | 2006 | ||
2007 | static int __devinit n2_crypto_probe(struct of_device *dev, | 2007 | static int __devinit n2_crypto_probe(struct platform_device *dev, |
2008 | const struct of_device_id *match) | 2008 | const struct of_device_id *match) |
2009 | { | 2009 | { |
2010 | struct mdesc_handle *mdesc; | 2010 | struct mdesc_handle *mdesc; |
@@ -2081,7 +2081,7 @@ out_free_n2cp: | |||
2081 | return err; | 2081 | return err; |
2082 | } | 2082 | } |
2083 | 2083 | ||
2084 | static int __devexit n2_crypto_remove(struct of_device *dev) | 2084 | static int __devexit n2_crypto_remove(struct platform_device *dev) |
2085 | { | 2085 | { |
2086 | struct n2_crypto *np = dev_get_drvdata(&dev->dev); | 2086 | struct n2_crypto *np = dev_get_drvdata(&dev->dev); |
2087 | 2087 | ||
@@ -2116,7 +2116,7 @@ static void free_ncp(struct n2_mau *mp) | |||
2116 | kfree(mp); | 2116 | kfree(mp); |
2117 | } | 2117 | } |
2118 | 2118 | ||
2119 | static int __devinit n2_mau_probe(struct of_device *dev, | 2119 | static int __devinit n2_mau_probe(struct platform_device *dev, |
2120 | const struct of_device_id *match) | 2120 | const struct of_device_id *match) |
2121 | { | 2121 | { |
2122 | struct mdesc_handle *mdesc; | 2122 | struct mdesc_handle *mdesc; |
@@ -2184,7 +2184,7 @@ out_free_ncp: | |||
2184 | return err; | 2184 | return err; |
2185 | } | 2185 | } |
2186 | 2186 | ||
2187 | static int __devexit n2_mau_remove(struct of_device *dev) | 2187 | static int __devexit n2_mau_remove(struct platform_device *dev) |
2188 | { | 2188 | { |
2189 | struct n2_mau *mp = dev_get_drvdata(&dev->dev); | 2189 | struct n2_mau *mp = dev_get_drvdata(&dev->dev); |
2190 | 2190 | ||