* [git pull] (updated) OF-related build breakage fixes
@ 2010-06-03 3:06 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 3:06 UTC (permalink / raw)
To: Linus Torvalds, Linux Kernel Mailing List
Cc: devicetree-discuss, Anatolij Gustschin
Updated pull request. Added more fixes from Anatolij of the same sort.
g.
The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
Linus Torvalds (1):
Merge branch 'next' of git://git.kernel.org/.../benh/powerpc
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 merge
Alexandre Bounine (1):
of/powerpc: fix 85xx RapidIO device node pointer
Anatolij Gustschin (12):
of/spi: mpc512x_psc_spi.c: Fix build failures
of/mtd/nand: mpc5121_nfc.c: Fix build failures
of/dma: mpc512x_dma.c: Fix build failures
of/pcmcia: m8xx_pcmcia.c: Fix build failures
of/video: fix build breakage in FB drivers
of/mtd: nand: fix build breakage in drivers
of/dma: fix build breakage in ppc4xx adma driver
of/crypto: crypto4xx_core.c: fix build breakage
of/usb: fsl_qe_udc.c: fix build breakage
of/net: fs_enet/mii-bitbang.c: fix build breakage
of/edac: fix build breakage in drivers
of/watchdog: gef_wdt.c: fix build breakage
Grant Likely (3):
of/usb: fix build error due to of_node pointer move
of/spi: Fix build failure on spi_ppc4xx.c
of/rtc: rtc-mpc5121.c: Fix build failures
Michael Guntsche (1):
watchdog: Fix build failure with OF changes
arch/powerpc/sysdev/fsl_rio.c | 2 +-
drivers/crypto/amcc/crypto4xx_core.c | 6 +++---
drivers/dma/mpc512x_dma.c | 10 +++++-----
drivers/dma/ppc4xx/adma.c | 4 ++--
drivers/edac/mpc85xx_edac.c | 12 ++++++------
drivers/edac/ppc4xx_edac.c | 6 +++---
drivers/mtd/nand/fsl_upm.c | 17 +++++++++--------
drivers/mtd/nand/mpc5121_nfc.c | 8 ++++----
drivers/mtd/nand/socrates_nand.c | 4 ++--
drivers/net/fs_enet/mii-bitbang.c | 4 ++--
drivers/pcmcia/m8xx_pcmcia.c | 4 ++--
drivers/rtc/rtc-mpc5121.c | 14 ++++++++------
drivers/spi/mpc512x_psc_spi.c | 12 ++++++------
drivers/spi/spi_ppc4xx.c | 2 +-
drivers/usb/gadget/fsl_qe_udc.c | 4 ++--
drivers/usb/host/ehci-xilinx-of.c | 2 +-
drivers/video/bw2.c | 2 +-
drivers/video/cg14.c | 2 +-
drivers/video/cg3.c | 2 +-
drivers/video/leo.c | 2 +-
drivers/video/mb862xx/mb862xxfb.c | 2 +-
drivers/video/p9100.c | 2 +-
drivers/video/tcx.c | 2 +-
drivers/watchdog/gef_wdt.c | 2 +-
drivers/watchdog/mpc8xxx_wdt.c | 2 +-
25 files changed, 66 insertions(+), 63 deletions(-)
On Wed, Jun 2, 2010 at 2:24 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
> Hi Linus,
>
> Here's a set of build fixes related to the of_node and of_match_table
> device changes. All trivial fixes.
>
> Thanks,
> g.
>
> The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
> Linus Torvalds (1):
> Merge branch 'next' of git://git.kernel.org/.../benh/powerpc
>
> are available in the git repository at:
>
> git://git.secretlab.ca/git/linux-2.6 merge
>
> Alexandre Bounine (1):
> of/powerpc: fix 85xx RapidIO device node pointer
>
> Anatolij Gustschin (3):
> of/spi: mpc512x_psc_spi.c: Fix build failures
> of/mtd/nand: mpc5121_nfc.c: Fix build failures
> of/dma: mpc512x_dma.c: Fix build failures
>
> Grant Likely (3):
> of/usb: fix build error due to of_node pointer move
> of/spi: Fix build failure on spi_ppc4xx.c
> of/rtc: rtc-mpc5121.c: Fix build failures
>
> Michael Guntsche (1):
> watchdog: Fix build failure with OF changes
>
> arch/powerpc/sysdev/fsl_rio.c | 2 +-
> drivers/dma/mpc512x_dma.c | 10 +++++-----
> drivers/mtd/nand/mpc5121_nfc.c | 8 ++++----
> drivers/rtc/rtc-mpc5121.c | 14 ++++++++------
> drivers/spi/mpc512x_psc_spi.c | 12 ++++++------
> drivers/spi/spi_ppc4xx.c | 2 +-
> drivers/usb/host/ehci-xilinx-of.c | 2 +-
> drivers/watchdog/mpc8xxx_wdt.c | 2 +-
> 8 files changed, 27 insertions(+), 25 deletions(-)
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 21+ messages in thread
* [git pull] (updated) OF-related build breakage fixes
@ 2010-06-03 3:06 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 3:06 UTC (permalink / raw)
To: Linus Torvalds, Linux Kernel Mailing List; +Cc: devicetree-discuss
Updated pull request. Added more fixes from Anatolij of the same sort.
g.
The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
Linus Torvalds (1):
Merge branch 'next' of git://git.kernel.org/.../benh/powerpc
are available in the git repository at:
git://git.secretlab.ca/git/linux-2.6 merge
Alexandre Bounine (1):
of/powerpc: fix 85xx RapidIO device node pointer
Anatolij Gustschin (12):
of/spi: mpc512x_psc_spi.c: Fix build failures
of/mtd/nand: mpc5121_nfc.c: Fix build failures
of/dma: mpc512x_dma.c: Fix build failures
of/pcmcia: m8xx_pcmcia.c: Fix build failures
of/video: fix build breakage in FB drivers
of/mtd: nand: fix build breakage in drivers
of/dma: fix build breakage in ppc4xx adma driver
of/crypto: crypto4xx_core.c: fix build breakage
of/usb: fsl_qe_udc.c: fix build breakage
of/net: fs_enet/mii-bitbang.c: fix build breakage
of/edac: fix build breakage in drivers
of/watchdog: gef_wdt.c: fix build breakage
Grant Likely (3):
of/usb: fix build error due to of_node pointer move
of/spi: Fix build failure on spi_ppc4xx.c
of/rtc: rtc-mpc5121.c: Fix build failures
Michael Guntsche (1):
watchdog: Fix build failure with OF changes
arch/powerpc/sysdev/fsl_rio.c | 2 +-
drivers/crypto/amcc/crypto4xx_core.c | 6 +++---
drivers/dma/mpc512x_dma.c | 10 +++++-----
drivers/dma/ppc4xx/adma.c | 4 ++--
drivers/edac/mpc85xx_edac.c | 12 ++++++------
drivers/edac/ppc4xx_edac.c | 6 +++---
drivers/mtd/nand/fsl_upm.c | 17 +++++++++--------
drivers/mtd/nand/mpc5121_nfc.c | 8 ++++----
drivers/mtd/nand/socrates_nand.c | 4 ++--
drivers/net/fs_enet/mii-bitbang.c | 4 ++--
drivers/pcmcia/m8xx_pcmcia.c | 4 ++--
drivers/rtc/rtc-mpc5121.c | 14 ++++++++------
drivers/spi/mpc512x_psc_spi.c | 12 ++++++------
drivers/spi/spi_ppc4xx.c | 2 +-
drivers/usb/gadget/fsl_qe_udc.c | 4 ++--
drivers/usb/host/ehci-xilinx-of.c | 2 +-
drivers/video/bw2.c | 2 +-
drivers/video/cg14.c | 2 +-
drivers/video/cg3.c | 2 +-
drivers/video/leo.c | 2 +-
drivers/video/mb862xx/mb862xxfb.c | 2 +-
drivers/video/p9100.c | 2 +-
drivers/video/tcx.c | 2 +-
drivers/watchdog/gef_wdt.c | 2 +-
drivers/watchdog/mpc8xxx_wdt.c | 2 +-
25 files changed, 66 insertions(+), 63 deletions(-)
On Wed, Jun 2, 2010 at 2:24 PM, Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org> wrote:
> Hi Linus,
>
> Here's a set of build fixes related to the of_node and of_match_table
> device changes. All trivial fixes.
>
> Thanks,
> g.
>
> The following changes since commit aef4b9aaae1decc775778903922bd0075cce7a88:
> Linus Torvalds (1):
> Merge branch 'next' of git://git.kernel.org/.../benh/powerpc
>
> are available in the git repository at:
>
> git://git.secretlab.ca/git/linux-2.6 merge
>
> Alexandre Bounine (1):
> of/powerpc: fix 85xx RapidIO device node pointer
>
> Anatolij Gustschin (3):
> of/spi: mpc512x_psc_spi.c: Fix build failures
> of/mtd/nand: mpc5121_nfc.c: Fix build failures
> of/dma: mpc512x_dma.c: Fix build failures
>
> Grant Likely (3):
> of/usb: fix build error due to of_node pointer move
> of/spi: Fix build failure on spi_ppc4xx.c
> of/rtc: rtc-mpc5121.c: Fix build failures
>
> Michael Guntsche (1):
> watchdog: Fix build failure with OF changes
>
> arch/powerpc/sysdev/fsl_rio.c | 2 +-
> drivers/dma/mpc512x_dma.c | 10 +++++-----
> drivers/mtd/nand/mpc5121_nfc.c | 8 ++++----
> drivers/rtc/rtc-mpc5121.c | 14 ++++++++------
> drivers/spi/mpc512x_psc_spi.c | 12 ++++++------
> drivers/spi/spi_ppc4xx.c | 2 +-
> drivers/usb/host/ehci-xilinx-of.c | 2 +-
> drivers/watchdog/mpc8xxx_wdt.c | 2 +-
> 8 files changed, 27 insertions(+), 25 deletions(-)
>
> --
> Grant Likely, B.Sc., P.Eng.
> Secret Lab Technologies Ltd.
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
@ 2010-06-03 4:01 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:01 UTC (permalink / raw)
To: Grant Likely
Cc: Linus Torvalds, Linux Kernel Mailing List, devicetree-discuss
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
On Wed, Jun 02, 2010 at 09:06:54PM -0600, Grant Likely wrote:
> Updated pull request. Added more fixes from Anatolij of the same sort.
Just a second. I think I found two more (using coccinelle)...
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
@ 2010-06-03 4:01 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:01 UTC (permalink / raw)
To: Grant Likely
Cc: devicetree-discuss, Linus Torvalds, Linux Kernel Mailing List
[-- Attachment #1.1: Type: text/plain, Size: 362 bytes --]
On Wed, Jun 02, 2010 at 09:06:54PM -0600, Grant Likely wrote:
> Updated pull request. Added more fixes from Anatolij of the same sort.
Just a second. I think I found two more (using coccinelle)...
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
[-- Attachment #2: Type: text/plain, Size: 192 bytes --]
_______________________________________________
devicetree-discuss mailing list
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
@ 2010-06-03 4:03 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:03 UTC (permalink / raw)
To: devicetree-discuss
Cc: linux-kernel, Linus Torvalds, Wolfram Sang, Grant Likely
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
arch/powerpc/sysdev/fsl_msi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 0f5bee9..962c2d8 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -347,7 +347,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
goto error_out;
}
offset = 0;
- p = of_get_property(dev->node, "msi-available-ranges", &len);
+ p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
if (p)
offset = *p / IRQS_PER_MSI_REG;
--
1.7.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
@ 2010-06-03 4:03 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:03 UTC (permalink / raw)
To: devicetree-discuss-mnsaURCQ41sdnm+yROfE0A
Cc: Linus Torvalds, linux-kernel-u79uwXL29TY76Z2rM5mHXA
Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---
arch/powerpc/sysdev/fsl_msi.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index 0f5bee9..962c2d8 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -347,7 +347,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
goto error_out;
}
offset = 0;
- p = of_get_property(dev->node, "msi-available-ranges", &len);
+ p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
if (p)
offset = *p / IRQS_PER_MSI_REG;
--
1.7.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 4:03 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:03 UTC (permalink / raw)
To: devicetree-discuss
Cc: linux-kernel, Linus Torvalds, Wolfram Sang, Grant Likely
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
drivers/crypto/n2_core.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 8566be8..3f813d3 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -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();
--
1.7.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 4:03 ` Wolfram Sang
0 siblings, 0 replies; 21+ messages in thread
From: Wolfram Sang @ 2010-06-03 4:03 UTC (permalink / raw)
To: devicetree-discuss-mnsaURCQ41sdnm+yROfE0A
Cc: Linus Torvalds, linux-kernel-u79uwXL29TY76Z2rM5mHXA
Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
---
drivers/crypto/n2_core.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c
index 8566be8..3f813d3 100644
--- a/drivers/crypto/n2_core.c
+++ b/drivers/crypto/n2_core.c
@@ -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();
--
1.7.0
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 4:25 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 4:25 UTC (permalink / raw)
To: Wolfram Sang; +Cc: devicetree-discuss, linux-kernel, Linus Torvalds
On Wed, Jun 2, 2010 at 10:03 PM, Wolfram Sang <w.sang@pengutronix.de> wrote:
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> ---
> drivers/crypto/n2_core.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
Anatolij already posted a patch for this; and David let me know that
it has already been fixed in the crypto tree, so I dropped it before
pushing my tree out.
g.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 4:25 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 4:25 UTC (permalink / raw)
To: Wolfram Sang
Cc: devicetree-discuss-mnsaURCQ41sdnm+yROfE0A, Linus Torvalds,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Wed, Jun 2, 2010 at 10:03 PM, Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote:
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> ---
> drivers/crypto/n2_core.c | 12 ++++++------
> 1 files changed, 6 insertions(+), 6 deletions(-)
Anatolij already posted a patch for this; and David let me know that
it has already been fixed in the crypto tree, so I dropped it before
pushing my tree out.
g.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
@ 2010-06-03 4:50 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 4:50 UTC (permalink / raw)
To: Wolfram Sang; +Cc: devicetree-discuss, linux-kernel, Linus Torvalds
On Wed, Jun 2, 2010 at 10:03 PM, Wolfram Sang <w.sang@pengutronix.de> wrote:
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> ---
> arch/powerpc/sysdev/fsl_msi.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Applied, thanks.
Linus, I've also added this one to my tree. Wolfram did an coccinelle
patch and hasn't found any more instances of this breakage.
g.
>
> diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
> index 0f5bee9..962c2d8 100644
> --- a/arch/powerpc/sysdev/fsl_msi.c
> +++ b/arch/powerpc/sysdev/fsl_msi.c
> @@ -347,7 +347,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
> goto error_out;
> }
> offset = 0;
> - p = of_get_property(dev->node, "msi-available-ranges", &len);
> + p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
> if (p)
> offset = *p / IRQS_PER_MSI_REG;
>
> --
> 1.7.0
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer
@ 2010-06-03 4:50 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-06-03 4:50 UTC (permalink / raw)
To: Wolfram Sang
Cc: devicetree-discuss-mnsaURCQ41sdnm+yROfE0A, Linus Torvalds,
linux-kernel-u79uwXL29TY76Z2rM5mHXA
On Wed, Jun 2, 2010 at 10:03 PM, Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote:
> Signed-off-by: Wolfram Sang <w.sang-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> ---
> arch/powerpc/sysdev/fsl_msi.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
Applied, thanks.
Linus, I've also added this one to my tree. Wolfram did an coccinelle
patch and hasn't found any more instances of this breakage.
g.
>
> diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
> index 0f5bee9..962c2d8 100644
> --- a/arch/powerpc/sysdev/fsl_msi.c
> +++ b/arch/powerpc/sysdev/fsl_msi.c
> @@ -347,7 +347,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
> goto error_out;
> }
> offset = 0;
> - p = of_get_property(dev->node, "msi-available-ranges", &len);
> + p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
> if (p)
> offset = *p / IRQS_PER_MSI_REG;
>
> --
> 1.7.0
>
>
--
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
2010-06-03 4:03 ` Wolfram Sang
@ 2010-06-03 9:49 ` David Miller
-1 siblings, 0 replies; 21+ messages in thread
From: David Miller @ 2010-06-03 9:49 UTC (permalink / raw)
To: w.sang
Cc: devicetree-discuss, linux-kernel, torvalds, grant.likely,
linux-crypto, herbert
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Thu, 3 Jun 2010 06:03:47 +0200
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
Herbert you really need to push your pending crypto tree stuff to
Linus, this is the second time this build fix has been posted just
today alone and it's in your tree since last week :-)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 9:49 ` David Miller
0 siblings, 0 replies; 21+ messages in thread
From: David Miller @ 2010-06-03 9:49 UTC (permalink / raw)
To: w.sang
Cc: devicetree-discuss, linux-kernel, torvalds, grant.likely,
linux-crypto, herbert
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Thu, 3 Jun 2010 06:03:47 +0200
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
Herbert you really need to push your pending crypto tree stuff to
Linus, this is the second time this build fix has been posted just
today alone and it's in your tree since last week :-)
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
2010-06-03 9:49 ` David Miller
@ 2010-06-03 10:03 ` Herbert Xu
-1 siblings, 0 replies; 21+ messages in thread
From: Herbert Xu @ 2010-06-03 10:03 UTC (permalink / raw)
To: David Miller
Cc: w.sang, devicetree-discuss, linux-kernel, torvalds, grant.likely,
linux-crypto
On Thu, Jun 03, 2010 at 02:49:02AM -0700, David Miller wrote:
> From: Wolfram Sang <w.sang@pengutronix.de>
> Date: Thu, 3 Jun 2010 06:03:47 +0200
>
> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
>
> Herbert you really need to push your pending crypto tree stuff to
> Linus, this is the second time this build fix has been posted just
> today alone and it's in your tree since last week :-)
Sorry, I hadn't realised that the breakage was in the main tree
as opposed to linux-next.
I'll push it out now.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH 2/2] of/crypto: n2_core: fix build breakage
@ 2010-06-03 10:03 ` Herbert Xu
0 siblings, 0 replies; 21+ messages in thread
From: Herbert Xu @ 2010-06-03 10:03 UTC (permalink / raw)
To: David Miller
Cc: w.sang, devicetree-discuss, linux-kernel, torvalds, grant.likely,
linux-crypto
On Thu, Jun 03, 2010 at 02:49:02AM -0700, David Miller wrote:
> From: Wolfram Sang <w.sang@pengutronix.de>
> Date: Thu, 3 Jun 2010 06:03:47 +0200
>
> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
>
> Herbert you really need to push your pending crypto tree stuff to
> Linus, this is the second time this build fix has been posted just
> today alone and it's in your tree since last week :-)
Sorry, I hadn't realised that the breakage was in the main tree
as opposed to linux-next.
I'll push it out now.
Thanks,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
2010-06-03 3:06 ` Grant Likely
` (3 preceding siblings ...)
(?)
@ 2010-07-01 9:06 ` Dan Williams
2010-07-01 13:16 ` Anatolij Gustschin
-1 siblings, 1 reply; 21+ messages in thread
From: Dan Williams @ 2010-07-01 9:06 UTC (permalink / raw)
To: Grant Likely
Cc: Linux Kernel Mailing List, devicetree-discuss, Anatolij Gustschin
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
On Wed, Jun 2, 2010 at 8:06 PM, Grant Likely <grant.likely@secretlab.ca> wrote:
> Updated pull request. Added more fixes from Anatolij of the same sort.
Here is one more (attached) that seems to have escaped.
--
Dan
[-- Attachment #2: fix-ppc4xx-adma-build.patch --]
[-- Type: application/octet-stream, Size: 1085 bytes --]
of/dma: fix remaining ppc4xx build breakage
From: Dan Williams <dan.j.williams@intel.com>
Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
missed one conversion site.
Cc: Anatolij Gustschin <agust@denx.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
---
drivers/dma/ppc4xx/adma.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index 5a22ca6..7c37479 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
struct ppc440spe_adma_chan *chan,
int *initcode)
{
+ struct of_device *ofdev;
struct device_node *np;
int ret;
- np = container_of(adev->dev, struct of_device, dev)->node;
+ ofdev = container_of(adev->dev, struct of_device, dev);
+ np = ofdev->dev.of_node;
if (adev->id != PPC440SPE_XOR_ID) {
adev->err_irq = irq_of_parse_and_map(np, 1);
if (adev->err_irq == NO_IRQ) {
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
@ 2010-07-01 13:16 ` Anatolij Gustschin
0 siblings, 0 replies; 21+ messages in thread
From: Anatolij Gustschin @ 2010-07-01 13:16 UTC (permalink / raw)
To: Dan Williams; +Cc: Grant Likely, Linux Kernel Mailing List, devicetree-discuss
On Thu, 1 Jul 2010 02:06:35 -0700
Dan Williams <dan.j.williams@gmail.com> wrote:
> of/dma: fix remaining ppc4xx build breakage
>
> From: Dan Williams <dan.j.williams@intel.com>
>
> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
> missed one conversion site.
>
> Cc: Anatolij Gustschin <agust@denx.de>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> ---
>
> drivers/dma/ppc4xx/adma.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
Acked-by: Anatolij Gustschin <agust@denx.de>
Thanks for fixing!
>
>
> diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
> index 5a22ca6..7c37479 100644
> --- a/drivers/dma/ppc4xx/adma.c
> +++ b/drivers/dma/ppc4xx/adma.c
> @@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
> struct ppc440spe_adma_chan *chan,
> int *initcode)
> {
> + struct of_device *ofdev;
> struct device_node *np;
> int ret;
>
> - np = container_of(adev->dev, struct of_device, dev)->node;
> + ofdev = container_of(adev->dev, struct of_device, dev);
> + np = ofdev->dev.of_node;
> if (adev->id != PPC440SPE_XOR_ID) {
> adev->err_irq = irq_of_parse_and_map(np, 1);
> if (adev->err_irq == NO_IRQ) {
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
@ 2010-07-01 13:16 ` Anatolij Gustschin
0 siblings, 0 replies; 21+ messages in thread
From: Anatolij Gustschin @ 2010-07-01 13:16 UTC (permalink / raw)
To: Dan Williams; +Cc: devicetree-discuss, Linux Kernel Mailing List
On Thu, 1 Jul 2010 02:06:35 -0700
Dan Williams <dan.j.williams-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> of/dma: fix remaining ppc4xx build breakage
>
> From: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
>
> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
> missed one conversion site.
>
> Cc: Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>
> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Signed-off-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
> ---
>
> drivers/dma/ppc4xx/adma.c | 4 +++-
> 1 files changed, 3 insertions(+), 1 deletions(-)
Acked-by: Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org>
Thanks for fixing!
>
>
> diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
> index 5a22ca6..7c37479 100644
> --- a/drivers/dma/ppc4xx/adma.c
> +++ b/drivers/dma/ppc4xx/adma.c
> @@ -4257,10 +4257,12 @@ static int ppc440spe_adma_setup_irqs(struct ppc440spe_adma_device *adev,
> struct ppc440spe_adma_chan *chan,
> int *initcode)
> {
> + struct of_device *ofdev;
> struct device_node *np;
> int ret;
>
> - np = container_of(adev->dev, struct of_device, dev)->node;
> + ofdev = container_of(adev->dev, struct of_device, dev);
> + np = ofdev->dev.of_node;
> if (adev->id != PPC440SPE_XOR_ID) {
> adev->err_irq = irq_of_parse_and_map(np, 1);
> if (adev->err_irq == NO_IRQ) {
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
2010-07-01 13:16 ` Anatolij Gustschin
@ 2010-07-02 21:53 ` Grant Likely
-1 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-07-02 21:53 UTC (permalink / raw)
To: Anatolij Gustschin
Cc: Dan Williams, Linux Kernel Mailing List, devicetree-discuss
On Thu, Jul 1, 2010 at 7:16 AM, Anatolij Gustschin <agust@denx.de> wrote:
> On Thu, 1 Jul 2010 02:06:35 -0700
> Dan Williams <dan.j.williams@gmail.com> wrote:
>
>> of/dma: fix remaining ppc4xx build breakage
>>
>> From: Dan Williams <dan.j.williams@intel.com>
>>
>> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
>> missed one conversion site.
Thanks Dan. I've picked this up and will push it out to Linus
g.
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [git pull] (updated) OF-related build breakage fixes
@ 2010-07-02 21:53 ` Grant Likely
0 siblings, 0 replies; 21+ messages in thread
From: Grant Likely @ 2010-07-02 21:53 UTC (permalink / raw)
To: Anatolij Gustschin
Cc: Dan Williams, devicetree-discuss, Linux Kernel Mailing List
On Thu, Jul 1, 2010 at 7:16 AM, Anatolij Gustschin <agust-ynQEQJNshbs@public.gmane.org> wrote:
> On Thu, 1 Jul 2010 02:06:35 -0700
> Dan Williams <dan.j.williams-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>
>> of/dma: fix remaining ppc4xx build breakage
>>
>> From: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
>>
>> Commit 05c02542 "of/dma: fix build breakage in ppc4xx adma driver"
>> missed one conversion site.
Thanks Dan. I've picked this up and will push it out to Linus
g.
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2010-07-02 21:53 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-06-03 3:06 [git pull] (updated) OF-related build breakage fixes Grant Likely
2010-06-03 3:06 ` Grant Likely
2010-06-03 4:01 ` Wolfram Sang
2010-06-03 4:01 ` Wolfram Sang
2010-06-03 4:03 ` [PATCH 1/2] of/powerpc: fix fsl_msi device node pointer Wolfram Sang
2010-06-03 4:03 ` Wolfram Sang
2010-06-03 4:50 ` Grant Likely
2010-06-03 4:50 ` Grant Likely
2010-06-03 4:03 ` [PATCH 2/2] of/crypto: n2_core: fix build breakage Wolfram Sang
2010-06-03 4:03 ` Wolfram Sang
2010-06-03 4:25 ` Grant Likely
2010-06-03 4:25 ` Grant Likely
2010-06-03 9:49 ` David Miller
2010-06-03 9:49 ` David Miller
2010-06-03 10:03 ` Herbert Xu
2010-06-03 10:03 ` Herbert Xu
2010-07-01 9:06 ` [git pull] (updated) OF-related build breakage fixes Dan Williams
2010-07-01 13:16 ` Anatolij Gustschin
2010-07-01 13:16 ` Anatolij Gustschin
2010-07-02 21:53 ` Grant Likely
2010-07-02 21:53 ` Grant Likely
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.