[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <56780F42.2020907@candw.ms>
Date: Mon, 21 Dec 2015 10:40:02 -0400
From: Julian Margetson <runaway@...dw.ms>
To: Måns Rullgård <mans@...sr.com>
Cc: Andy Shevchenko <andy.shevchenko@...il.com>,
Viresh Kumar <viresh.linux@...il.com>,
Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
Tejun Heo <tj@...nel.org>, linux-ide@...r.kernel.org,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/3] ata: sata_dwc_460ex: use "dmas" DT property to find
dma channel
On 12/21/2015 9:24 AM, Måns Rullgård wrote:
> Julian Margetson <runaway@...dw.ms> writes:
>
>>>>> P.S. Anyway we have to ask Julian to try the kernel with
>>>>> 8b3444852a2b58129 reverted.
>>>>>
>>>> git revert 8b3444852a2b58129
>>>> error: could not revert 8b34448... sata_dwc_460ex: move to generic DMA driver
>>>> hint: after resolving the conflicts, mark the corrected paths
>>>> hint: with 'git add <paths>' or 'git rm <paths>'
>>>> hint: and commit the result with 'git commit'
>>> Yeah, that won't work since there are numerous changes afterward. Just
>>> revert the entire file back to 4.0 like this:
>>>
>>> $ git checkout v4.0 drivers/ata/sata_dwc_460ex.c
>>>
>> CC [M] drivers/ata/sata_dwc_460ex.o
>> drivers/ata/sata_dwc_460ex.c:467:36: error: macro
>> "dma_request_channel" requires 3 arguments, but only 1 given
>> static int dma_request_channel(void)
>> ^
>> drivers/ata/sata_dwc_460ex.c:468:1: error: expected ‘=’, ‘,’,
>> ‘;’, ‘asm’ or ‘__attribute__’ before ‘{’ token
>> {
>> ^
>> drivers/ata/sata_dwc_460ex.c: In function ‘dma_dwc_xfer_setup’:
>> drivers/ata/sata_dwc_460ex.c:758:31: error: macro
>> "dma_request_channel" requires 3 arguments, but only 1 given
>> dma_ch = dma_request_channel();
>> ^
>> drivers/ata/sata_dwc_460ex.c:758:11: error: ‘dma_request_channel’
>> undeclared (first use in this function)
>> dma_ch = dma_request_channel();
>> ^
>> drivers/ata/sata_dwc_460ex.c:758:11: note: each undeclared identifier
>> is reported only once for each function it appears in
>> drivers/ata/sata_dwc_460ex.c: In function ‘sata_dwc_dma_filter’:
>> drivers/ata/sata_dwc_460ex.c:1282:35: error: ‘struct
>> sata_dwc_device_port’ has no member named ‘dws’
>> struct dw_dma_slave *dws = hsdevp->dws;
>> ^
>> drivers/ata/sata_dwc_460ex.c: In function ‘sata_dwc_port_start’:
>> drivers/ata/sata_dwc_460ex.c:1325:17: warning: unused variable
>> ‘mask’ [-Wunused-variable]
>> dma_cap_mask_t mask;
>> ^
>> drivers/ata/sata_dwc_460ex.c: At top level:
>> drivers/ata/sata_dwc_460ex.c:345:28: warning: ‘sata_dwc_dma_dws’
>> defined but not used [-Wunused-variable]
>> static struct dw_dma_slave sata_dwc_dma_dws = {
>> ^
>> drivers/ata/sata_dwc_460ex.c:1279:13: warning:
>> ‘sata_dwc_dma_filter’ defined but not used [-Wunused-function]
>> static bool sata_dwc_dma_filter(struct dma_chan *chan, void *param)
>> ^
> Those messages do not match the contents of the file from v4.0.
> For your convenience, here's the file as it should be.
>
> $ sha1sum drivers/ata/sata_dwc_460ex.c
> 0f54dfa3a91591101f5de434c3a631a5cd20ff1a drivers/ata/sata_dwc_460ex.c
>
View attachment "log2.log" of type "text/plain" (184340 bytes)
Powered by blists - more mailing lists