| Message ID | 1376296638-19804-3-git-send-email-zonque@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 12, 2013 at 10:37:15AM +0200, Daniel Mack wrote:
> No functional change, just a cosmetic cleanup.
Applied, thanks.
On 12.08.2013 12:38, Mark Brown wrote: > On Mon, Aug 12, 2013 at 10:37:15AM +0200, Daniel Mack wrote: >> No functional change, just a cosmetic cleanup. > > Applied, thanks. > Which tree will you merge them through? ASoC? I actually thought Haojian would pick them, but I see there's a build dependency. So it might make sense if you take them instead. Daniel
On Mon, Aug 12, 2013 at 12:41:41PM +0200, Daniel Mack wrote: > Which tree will you merge them through? ASoC? Yes. > I actually thought Haojian would pick them, but I see there's a build > dependency. So it might make sense if you take them instead. They didn't obviously touch arch/arm so I'd expect them to go through the relevant driver tree.
On 12.08.2013 12:46, Mark Brown wrote: > On Mon, Aug 12, 2013 at 12:41:41PM +0200, Daniel Mack wrote: >> I actually thought Haojian would pick them, but I see there's a build >> dependency. So it might make sense if you take them instead. > > They didn't obviously touch arch/arm Well yes, *this* series does: .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 65 ++++++++ arch/arm/plat-pxa/ssp.c | 174 ++++++++++++++------- include/linux/pxa2xx_ssp.h | 11 ++ I posted two series, one is for arch/arm and one is for sound/soc/pxa. But as they have a dependency via pxa_ssp_request_of(), I'd actually prefer if you took all of them. Thanks, Daniel
On 12.08.2013 12:50, Daniel Mack wrote: > On 12.08.2013 12:46, Mark Brown wrote: >> On Mon, Aug 12, 2013 at 12:41:41PM +0200, Daniel Mack wrote: >>> I actually thought Haojian would pick them, but I see there's a build >>> dependency. So it might make sense if you take them instead. >> >> They didn't obviously touch arch/arm > > Well yes, *this* series does: > > .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 65 ++++++++ > arch/arm/plat-pxa/ssp.c | 174 > ++++++++++++++------- > include/linux/pxa2xx_ssp.h | 11 ++ > > I posted two series, one is for arch/arm and one is for sound/soc/pxa. > But as they have a dependency via pxa_ssp_request_of(), I'd actually > prefer if you took all of them. Haojian, could you give your Ack on this procedure? Thanks, Daniel
On 13 August 2013 17:02, Daniel Mack <zonque@gmail.com> wrote: > On 12.08.2013 12:50, Daniel Mack wrote: >> On 12.08.2013 12:46, Mark Brown wrote: >>> On Mon, Aug 12, 2013 at 12:41:41PM +0200, Daniel Mack wrote: >>>> I actually thought Haojian would pick them, but I see there's a build >>>> dependency. So it might make sense if you take them instead. >>> >>> They didn't obviously touch arch/arm >> >> Well yes, *this* series does: >> >> .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 65 ++++++++ >> arch/arm/plat-pxa/ssp.c | 174 >> ++++++++++++++------- >> include/linux/pxa2xx_ssp.h | 11 ++ >> >> I posted two series, one is for arch/arm and one is for sound/soc/pxa. >> But as they have a dependency via pxa_ssp_request_of(), I'd actually >> prefer if you took all of them. > > Haojian, could you give your Ack on this procedure? > > > Thanks, > Daniel > > Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
On Wed, Aug 14, 2013 at 11:30:48PM +0800, Haojian Zhuang wrote:
> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Applied, thanks.
On 14.08.2013 20:54, Mark Brown wrote: > On Wed, Aug 14, 2013 at 11:30:48PM +0800, Haojian Zhuang wrote: > >> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> > > Applied, thanks. > Great, thanks. You'll take the pxa/ssp series for ASoC as well then, right? Daniel
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c index f746b6a..65ba28a 100644 --- a/arch/arm/plat-pxa/ssp.c +++ b/arch/arm/plat-pxa/ssp.c @@ -77,6 +77,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) const struct platform_device_id *id = platform_get_device_id(pdev); struct resource *res; struct ssp_device *ssp; + struct device *dev = &pdev->dev; int ret = 0; ssp = kzalloc(sizeof(struct ssp_device), GFP_KERNEL); @@ -85,7 +86,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) ssp->pdev = pdev; - ssp->clk = clk_get(&pdev->dev, NULL); + ssp->clk = clk_get(dev, NULL); if (IS_ERR(ssp->clk)) { ret = PTR_ERR(ssp->clk); goto err_free; @@ -93,7 +94,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_DMA, 0); if (res == NULL) { - dev_err(&pdev->dev, "no SSP RX DRCMR defined\n"); + dev_err(dev, "no SSP RX DRCMR defined\n"); ret = -ENODEV; goto err_free_clk; } @@ -101,7 +102,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_DMA, 1); if (res == NULL) { - dev_err(&pdev->dev, "no SSP TX DRCMR defined\n"); + dev_err(dev, "no SSP TX DRCMR defined\n"); ret = -ENODEV; goto err_free_clk; } @@ -109,7 +110,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { - dev_err(&pdev->dev, "no memory resource defined\n"); + dev_err(dev, "no memory resource defined\n"); ret = -ENODEV; goto err_free_clk; } @@ -117,7 +118,7 @@ static int pxa_ssp_probe(struct platform_device *pdev) res = request_mem_region(res->start, resource_size(res), pdev->name); if (res == NULL) { - dev_err(&pdev->dev, "failed to request memory resource\n"); + dev_err(dev, "failed to request memory resource\n"); ret = -EBUSY; goto err_free_clk; } @@ -126,14 +127,14 @@ static int pxa_ssp_probe(struct platform_device *pdev) ssp->mmio_base = ioremap(res->start, resource_size(res)); if (ssp->mmio_base == NULL) { - dev_err(&pdev->dev, "failed to ioremap() registers\n"); + dev_err(dev, "failed to ioremap() registers\n"); ret = -ENODEV; goto err_free_mem; } ssp->irq = platform_get_irq(pdev, 0); if (ssp->irq < 0) { - dev_err(&pdev->dev, "no IRQ resource defined\n"); + dev_err(dev, "no IRQ resource defined\n"); ret = -ENODEV; goto err_free_io; }
No functional change, just a cosmetic cleanup. Signed-off-by: Daniel Mack <zonque@gmail.com> --- arch/arm/plat-pxa/ssp.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)