diff for duplicates of <201301292141.45931.florian@openwrt.org> diff --git a/a/1.txt b/N1/1.txt index dad59cd..488d9b6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,38 +1,37 @@ -Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a =E9crit : +Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a ?crit : > On Tue, Jan 29, 2013 at 04:24:07PM +0100, Florian Fainelli wrote: -> > - dev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0); +> > - dev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0); > > + if (pdev->dev.of_node) { -> > + dev->regs =3D of_iomap(pdev->dev.of_node, 0); +> > + dev->regs = of_iomap(pdev->dev.of_node, 0); > > + if (!dev->regs) { -> > + dev_err(&pdev->dev, "No SMI register address given in=20 +> > + dev_err(&pdev->dev, "No SMI register address given in DT\n"); -> > + ret =3D -ENODEV; +> > + ret = -ENODEV; > > + goto out_free; > > + } > > + -> > + dev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0); +> > + dev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0); > > + } else { -> > + r =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); +> > + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + -> > + dev->regs =3D ioremap(r->start, resource_size(r)); +> > + dev->regs = ioremap(r->start, resource_size(r)); > > + if (!dev->regs) { > > + dev_err(&pdev->dev, "No SMI register address given\n"); -> > + ret =3D -ENODEV; +> > + ret = -ENODEV; > > + goto out_free; > > + } > > + -> > + dev->err_interrupt =3D platform_get_irq(pdev, 0); +> > + dev->err_interrupt = platform_get_irq(pdev, 0); > > + } ->=20 +> > Why do you have these different paths for OF and platform? AFAIK these > days when a OF device is automatically converted into a platform > device all the struct resources are created too, so you can't you just > use platform_get_resource and devm_request_and_ioremap for both flows? ->=20 +> > Ditto for the interrupt - platform_get_irq should work in both cases? -There was no particular reason and I updated the patchset to do that precis= -ely=20 +There was no particular reason and I updated the patchset to do that precisely in version 2. -=2D-=20 -=46lorian +-- +Florian diff --git a/a/content_digest b/N1/content_digest index 5195e1d..ab09363 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,65 +1,48 @@ "ref\01359473048-26551-1-git-send-email-florian@openwrt.org\0" "ref\01359473048-26551-5-git-send-email-florian@openwrt.org\0" "ref\020130129175912.GE25646@obsidianresearch.com\0" - "From\0Florian Fainelli <florian@openwrt.org>\0" - "Subject\0Re: [PATCH 4/5] net: mvmdio: allow Device Tree and platform device to coexist\0" + "From\0florian@openwrt.org (Florian Fainelli)\0" + "Subject\0[PATCH 4/5] net: mvmdio: allow Device Tree and platform device to coexist\0" "Date\0Tue, 29 Jan 2013 21:41:45 +0100\0" - "To\0Jason Gunthorpe <jgunthorpe@obsidianresearch.com>\0" - "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>" - Andrew Lunn <andrew@lunn.ch> - Russell King <linux@arm.linux.org.uk> - Jason Cooper <jason@lakedaemon.net> - linux-doc@vger.kernel.org - devicetree-discuss@lists.ozlabs.org - linux-kernel@vger.kernel.org - Rob Herring <rob.herring@calxeda.com> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> - Paul Mackerras <paulus@samba.org> - Lennert Buytenhek <buytenh@wantstofly.org> - Rob Landley <rob@landley.net> - netdev@vger.kernel.org - linuxppc-dev@lists.ozlabs.org - davem@davemloft.net - " linux-arm-kernel@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a =E9crit :\n" + "Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a ?crit :\n" "> On Tue, Jan 29, 2013 at 04:24:07PM +0100, Florian Fainelli wrote:\n" - "> > -\tdev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0);\n" + "> > -\tdev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0);\n" "> > +\tif (pdev->dev.of_node) {\n" - "> > +\t\tdev->regs =3D of_iomap(pdev->dev.of_node, 0);\n" + "> > +\t\tdev->regs = of_iomap(pdev->dev.of_node, 0);\n" "> > +\t\tif (!dev->regs) {\n" - "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given in=20\n" + "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given in \n" "DT\\n\");\n" - "> > +\t\t\tret =3D -ENODEV;\n" + "> > +\t\t\tret = -ENODEV;\n" "> > +\t\t\tgoto out_free;\n" "> > +\t\t}\n" "> > +\n" - "> > +\t\tdev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0);\n" + "> > +\t\tdev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0);\n" "> > +\t} else {\n" - "> > +\t\tr =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" + "> > +\t\tr = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" "> > +\n" - "> > +\t\tdev->regs =3D ioremap(r->start, resource_size(r));\n" + "> > +\t\tdev->regs = ioremap(r->start, resource_size(r));\n" "> > +\t\tif (!dev->regs) {\n" "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given\\n\");\n" - "> > +\t\t\tret =3D -ENODEV;\n" + "> > +\t\t\tret = -ENODEV;\n" "> > +\t\t\tgoto out_free;\n" "> > +\t\t}\n" "> > +\n" - "> > +\t\tdev->err_interrupt =3D platform_get_irq(pdev, 0);\n" + "> > +\t\tdev->err_interrupt = platform_get_irq(pdev, 0);\n" "> > +\t}\n" - ">=20\n" + "> \n" "> Why do you have these different paths for OF and platform? AFAIK these\n" "> days when a OF device is automatically converted into a platform\n" "> device all the struct resources are created too, so you can't you just\n" "> use platform_get_resource and devm_request_and_ioremap for both flows?\n" - ">=20\n" + "> \n" "> Ditto for the interrupt - platform_get_irq should work in both cases?\n" "\n" - "There was no particular reason and I updated the patchset to do that precis=\n" - "ely=20\n" + "There was no particular reason and I updated the patchset to do that precisely \n" "in version 2.\n" - "=2D-=20\n" - =46lorian + "-- \n" + Florian -663c3adc755f9100c3e8d8f9befb78e95ab0b186b7a88a4a15510ccd10c05b15 +47bad0fcc887682db3c453824fc9ddd462e7cf536151b0989545703cd1d8b218
diff --git a/a/1.txt b/N2/1.txt index dad59cd..2496094 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,38 +1,37 @@ -Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a =E9crit : +Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a écrit : > On Tue, Jan 29, 2013 at 04:24:07PM +0100, Florian Fainelli wrote: -> > - dev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0); +> > - dev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0); > > + if (pdev->dev.of_node) { -> > + dev->regs =3D of_iomap(pdev->dev.of_node, 0); +> > + dev->regs = of_iomap(pdev->dev.of_node, 0); > > + if (!dev->regs) { -> > + dev_err(&pdev->dev, "No SMI register address given in=20 +> > + dev_err(&pdev->dev, "No SMI register address given in DT\n"); -> > + ret =3D -ENODEV; +> > + ret = -ENODEV; > > + goto out_free; > > + } > > + -> > + dev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0); +> > + dev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0); > > + } else { -> > + r =3D platform_get_resource(pdev, IORESOURCE_MEM, 0); +> > + r = platform_get_resource(pdev, IORESOURCE_MEM, 0); > > + -> > + dev->regs =3D ioremap(r->start, resource_size(r)); +> > + dev->regs = ioremap(r->start, resource_size(r)); > > + if (!dev->regs) { > > + dev_err(&pdev->dev, "No SMI register address given\n"); -> > + ret =3D -ENODEV; +> > + ret = -ENODEV; > > + goto out_free; > > + } > > + -> > + dev->err_interrupt =3D platform_get_irq(pdev, 0); +> > + dev->err_interrupt = platform_get_irq(pdev, 0); > > + } ->=20 +> > Why do you have these different paths for OF and platform? AFAIK these > days when a OF device is automatically converted into a platform > device all the struct resources are created too, so you can't you just > use platform_get_resource and devm_request_and_ioremap for both flows? ->=20 +> > Ditto for the interrupt - platform_get_irq should work in both cases? -There was no particular reason and I updated the patchset to do that precis= -ely=20 +There was no particular reason and I updated the patchset to do that precisely in version 2. -=2D-=20 -=46lorian +-- +Florian diff --git a/a/content_digest b/N2/content_digest index 5195e1d..41b683d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,61 +5,62 @@ "Subject\0Re: [PATCH 4/5] net: mvmdio: allow Device Tree and platform device to coexist\0" "Date\0Tue, 29 Jan 2013 21:41:45 +0100\0" "To\0Jason Gunthorpe <jgunthorpe@obsidianresearch.com>\0" - "Cc\0Thomas Petazzoni <thomas.petazzoni@free-electrons.com>" + "Cc\0davem@davemloft.net" + Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Andrew Lunn <andrew@lunn.ch> Russell King <linux@arm.linux.org.uk> Jason Cooper <jason@lakedaemon.net> linux-doc@vger.kernel.org + Benjamin Herrenschmidt <benh@kernel.crashing.org> devicetree-discuss@lists.ozlabs.org linux-kernel@vger.kernel.org Rob Herring <rob.herring@calxeda.com> - Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Grant Likely <grant.likely@secretlab.ca> + netdev@vger.kernel.org Paul Mackerras <paulus@samba.org> - Lennert Buytenhek <buytenh@wantstofly.org> + linux-arm-kernel@lists.infradead.org Rob Landley <rob@landley.net> - netdev@vger.kernel.org + Greg Kroah-Hartman <gregkh@linuxfoundation.org> linuxppc-dev@lists.ozlabs.org - davem@davemloft.net - " linux-arm-kernel@lists.infradead.org\0" + " Lennert Buytenhek <buytenh@wantstofly.org>\0" "\00:1\0" "b\0" - "Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a =E9crit :\n" + "Le mardi 29 janvier 2013 18:59:12, Jason Gunthorpe a \303\251crit :\n" "> On Tue, Jan 29, 2013 at 04:24:07PM +0100, Florian Fainelli wrote:\n" - "> > -\tdev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0);\n" + "> > -\tdev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0);\n" "> > +\tif (pdev->dev.of_node) {\n" - "> > +\t\tdev->regs =3D of_iomap(pdev->dev.of_node, 0);\n" + "> > +\t\tdev->regs = of_iomap(pdev->dev.of_node, 0);\n" "> > +\t\tif (!dev->regs) {\n" - "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given in=20\n" + "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given in \n" "DT\\n\");\n" - "> > +\t\t\tret =3D -ENODEV;\n" + "> > +\t\t\tret = -ENODEV;\n" "> > +\t\t\tgoto out_free;\n" "> > +\t\t}\n" "> > +\n" - "> > +\t\tdev->err_interrupt =3D irq_of_parse_and_map(pdev->dev.of_node, 0);\n" + "> > +\t\tdev->err_interrupt = irq_of_parse_and_map(pdev->dev.of_node, 0);\n" "> > +\t} else {\n" - "> > +\t\tr =3D platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" + "> > +\t\tr = platform_get_resource(pdev, IORESOURCE_MEM, 0);\n" "> > +\n" - "> > +\t\tdev->regs =3D ioremap(r->start, resource_size(r));\n" + "> > +\t\tdev->regs = ioremap(r->start, resource_size(r));\n" "> > +\t\tif (!dev->regs) {\n" "> > +\t\t\tdev_err(&pdev->dev, \"No SMI register address given\\n\");\n" - "> > +\t\t\tret =3D -ENODEV;\n" + "> > +\t\t\tret = -ENODEV;\n" "> > +\t\t\tgoto out_free;\n" "> > +\t\t}\n" "> > +\n" - "> > +\t\tdev->err_interrupt =3D platform_get_irq(pdev, 0);\n" + "> > +\t\tdev->err_interrupt = platform_get_irq(pdev, 0);\n" "> > +\t}\n" - ">=20\n" + "> \n" "> Why do you have these different paths for OF and platform? AFAIK these\n" "> days when a OF device is automatically converted into a platform\n" "> device all the struct resources are created too, so you can't you just\n" "> use platform_get_resource and devm_request_and_ioremap for both flows?\n" - ">=20\n" + "> \n" "> Ditto for the interrupt - platform_get_irq should work in both cases?\n" "\n" - "There was no particular reason and I updated the patchset to do that precis=\n" - "ely=20\n" + "There was no particular reason and I updated the patchset to do that precisely \n" "in version 2.\n" - "=2D-=20\n" - =46lorian + "-- \n" + Florian -663c3adc755f9100c3e8d8f9befb78e95ab0b186b7a88a4a15510ccd10c05b15 +e83db913baead4091eca90158e6cc684902a0facdfe58ed576e5feca94523b2c
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.