linux-next: build failure after merge of the ath-next tree

linux-next: build failure after merge of the ath-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 657 bytes --]

Hi all,

After merging the ath-next tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/net/wireless/ath/ath12k/ahb.c: In function 'ath12k_ahb_stop':
drivers/net/wireless/ath/ath12k/ahb.c:337:9: error: implicit declaration of function 'del_timer_sync'; did you mean 'dev_mc_sync'? [-Wimplicit-function-declaration]
  337 |         del_timer_sync(&ab->rx_replenish_retry);
      |         ^~~~~~~~~~~~~~
      |         dev_mc_sync

Caused by commit

  6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332")

I have used the ath-next tree from next-20250407 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the ath-next tree

[Dr. David Alan Gilbert]

* Stephen Rothwell (sfr@canb.auug.org.au) wrote:
> Hi all,
> 
> After merging the ath-next tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/net/wireless/ath/ath12k/ahb.c: In function 'ath12k_ahb_stop':
> drivers/net/wireless/ath/ath12k/ahb.c:337:9: error: implicit declaration of function 'del_timer_sync'; did you mean 'dev_mc_sync'? [-Wimplicit-function-declaration]
>   337 |         del_timer_sync(&ab->rx_replenish_retry);
>       |         ^~~~~~~~~~~~~~
>       |         dev_mc_sync
> 
> Caused by commit
> 
>   6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332")
> 
> I have used the ath-next tree from next-20250407 for today.

I guess a clash with the recent:
Fixes: 8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")

Dave
> 
> -- 
> Cheers,
> Stephen Rothwell


-- 
 -----Open up your eyes, open up your mind, open up your code -------   
/ Dr. David Alan Gilbert    |       Running GNU/Linux       | Happy  \ 
\        dave @ treblig.org |                               | In Hex /
 \ _________________________|_____ http://www.treblig.org   |_______/

Re: linux-next: build failure after merge of the ath-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

Hi Dave,

On Tue, 8 Apr 2025 01:06:28 +0000 "Dr. David Alan Gilbert" <linux@treblig.org> wrote:
>
> * Stephen Rothwell (sfr@canb.auug.org.au) wrote:
> > 
> > After merging the ath-next tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/net/wireless/ath/ath12k/ahb.c: In function 'ath12k_ahb_stop':
> > drivers/net/wireless/ath/ath12k/ahb.c:337:9: error: implicit declaration of function 'del_timer_sync'; did you mean 'dev_mc_sync'? [-Wimplicit-function-declaration]
> >   337 |         del_timer_sync(&ab->rx_replenish_retry);
> >       |         ^~~~~~~~~~~~~~
> >       |         dev_mc_sync
> > 
> > Caused by commit
> > 
> >   6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332")
> > 
> > I have used the ath-next tree from next-20250407 for today.  
> 
> I guess a clash with the recent:
> Fixes: 8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")

I will try that out tomorrow.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the ath-next tree

[Jeff Johnson]

On 4/7/2025 6:37 PM, Stephen Rothwell wrote:
> Hi Dave,
> 
> On Tue, 8 Apr 2025 01:06:28 +0000 "Dr. David Alan Gilbert" <linux@treblig.org> wrote:
>>
>> * Stephen Rothwell (sfr@canb.auug.org.au) wrote:
>>>
>>> After merging the ath-next tree, today's linux-next build (x86_64
>>> allmodconfig) failed like this:
>>>
>>> drivers/net/wireless/ath/ath12k/ahb.c: In function 'ath12k_ahb_stop':
>>> drivers/net/wireless/ath/ath12k/ahb.c:337:9: error: implicit declaration of function 'del_timer_sync'; did you mean 'dev_mc_sync'? [-Wimplicit-function-declaration]
>>>   337 |         del_timer_sync(&ab->rx_replenish_retry);
>>>       |         ^~~~~~~~~~~~~~
>>>       |         dev_mc_sync
>>>
>>> Caused by commit
>>>
>>>   6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332")
>>>
>>> I have used the ath-next tree from next-20250407 for today.  
>>
>> I guess a clash with the recent:
>> Fixes: 8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")
> 
> I will try that out tomorrow.

Yes, looks like you'll need to carry a patch:
s/del_timer_sync/timer_delete_sync/

Until that renaming patch makes it down to my tree and we rename.

Re: linux-next: build failure after merge of the ath-next tree

[Jeff Johnson]

On 4/8/2025 8:09 AM, Jeff Johnson wrote:
> On 4/7/2025 6:37 PM, Stephen Rothwell wrote:
>> Hi Dave,
>>
>> On Tue, 8 Apr 2025 01:06:28 +0000 "Dr. David Alan Gilbert" <linux@treblig.org> wrote:
>>>
>>> * Stephen Rothwell (sfr@canb.auug.org.au) wrote:
>>>>
>>>> After merging the ath-next tree, today's linux-next build (x86_64
>>>> allmodconfig) failed like this:
>>>>
>>>> drivers/net/wireless/ath/ath12k/ahb.c: In function 'ath12k_ahb_stop':
>>>> drivers/net/wireless/ath/ath12k/ahb.c:337:9: error: implicit declaration of function 'del_timer_sync'; did you mean 'dev_mc_sync'? [-Wimplicit-function-declaration]
>>>>   337 |         del_timer_sync(&ab->rx_replenish_retry);
>>>>       |         ^~~~~~~~~~~~~~
>>>>       |         dev_mc_sync
>>>>
>>>> Caused by commit
>>>>
>>>>   6cee30f0da75 ("wifi: ath12k: add AHB driver support for IPQ5332")
>>>>
>>>> I have used the ath-next tree from next-20250407 for today.  
>>>
>>> I guess a clash with the recent:
>>> Fixes: 8fa7292fee5c ("treewide: Switch/rename to timer_delete[_sync]()")
>>
>> I will try that out tomorrow.
> 
> Yes, looks like you'll need to carry a patch:
> s/del_timer_sync/timer_delete_sync/
> 
> Until that renaming patch makes it down to my tree and we rename.

NM. Since the timer_delete_sync() API is already in my tree I can make a
one-off patch for this.

/jeff

Re: linux-next: build failure after merge of the ath-next tree

[Jeff Johnson]

On 4/8/2025 8:23 AM, Jeff Johnson wrote:
> NM. Since the timer_delete_sync() API is already in my tree I can make a
> one-off patch for this.

please review https://msgid.link/20250408-timer_delete_sync-v1-1-4dcb22f71083@oss.qualcomm.com

I'll wait a bit for any tags to accumulate before I merge into ath-next

/jeff

Re: linux-next: build failure after merge of the ath-next tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 542 bytes --]

Hi Jeff,

On Tue, 8 Apr 2025 09:17:21 -0700 Jeff Johnson <jeff.johnson@oss.qualcomm.com> wrote:
>
> On 4/8/2025 8:23 AM, Jeff Johnson wrote:
> > NM. Since the timer_delete_sync() API is already in my tree I can make a
> > one-off patch for this.  
> 
> please review https://msgid.link/20250408-timer_delete_sync-v1-1-4dcb22f71083@oss.qualcomm.com
> 
> I'll wait a bit for any tags to accumulate before I merge into ath-next

I'll use your patch in the ath-next tree merge today (if necessary).

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]