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

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

[Stephen Rothwell]

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

Hi all,

After merging the bluetooth tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

net/bluetooth/sco.c: In function 'sco_sock_setsockopt':
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
  862 |   if (get_user(opt, (u32 __user *)optval)) {
      |   ^~
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type
net/bluetooth/sco.c:862:3: error: cannot convert to a pointer type

Caused by commit

  00398e1d5183 ("Bluetooth: Add support for BT_PKT_STATUS CMSG data for SCO connections")

interacting with commit

  a7b75c5a8c41 ("net: pass a sockptr_t into ->setsockopt")

from the net-next tree.

I have applied the following merge fix patch:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 27 Jul 2020 13:41:30 +1000
Subject: [PATCH] Bluetooth: fix for introduction of sockptr_t

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 net/bluetooth/sco.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 6e6b03844a2a..dcf7f96ff417 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -859,7 +859,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
 		break;
 
 	case BT_PKT_STATUS:
-		if (get_user(opt, (u32 __user *)optval)) {
+		if (copy_from_sockptr(&opt, optval, sizeof(u32))) {
 			err = -EFAULT;
 			break;
 		}
-- 
2.27.0

-- 
Cheers,
Stephen Rothwell

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

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

[Christoph Hellwig]

The fixup looks good to me, thanks.

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

[Alain Michaud]

Same here, thanks for the fix!


On Mon, Jul 27, 2020 at 1:22 AM Christoph Hellwig <hch@lst.de> wrote:
>
> The fixup looks good to me, thanks.

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

[Stephen Rothwell]

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

Hi Jakub,

On Thu, 20 Jul 2023 16:27:56 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Fri, 21 Jul 2023 08:12:58 +1000 Stephen Rothwell wrote:
> > > I kicked it off and forgot about it.
> > > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S    
> > 
> > Of course it does, as commit
> > 
> > 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > 
> > is reverted in linux-next.  The question is "Does the bluetooth tree
> > build?" or "Does the net-next tree build *if* you merge the bluetooth
> > tree into it?"  
> 
> Sorry for being slow, yes. I just did a test build with net-next and
> bluetooth-next combined and allmodconfig is okay, so you should be good
> to drop the revert. Fingers crossed.

Excellent, thanks.

-- 
Cheers,
Stephen Rothwell

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

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

[Jakub Kicinski]

On Fri, 21 Jul 2023 08:12:58 +1000 Stephen Rothwell wrote:
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S  
> 
> Of course it does, as commit
> 
> 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> is reverted in linux-next.  The question is "Does the bluetooth tree
> build?" or "Does the net-next tree build *if* you merge the bluetooth
> tree into it?"

Sorry for being slow, yes. I just did a test build with net-next and
bluetooth-next combined and allmodconfig is okay, so you should be good
to drop the revert. Fingers crossed.

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

[Iwashima, Kuniyuki]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 21 Jul 2023 08:12:58 +1000
> Hi Jakub,
> 
> On Thu, 20 Jul 2023 08:14:30 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > > not scm_recv_unix, so Id assume that change would return the initial
> > > > behavior, if it did not then it is not fixing anything.    
> > >
> > > Ack, that's what it seems like to me as well.
> > >
> > > I fired up an allmodconfig build of linux-next. I should be able
> > > to get to the bottom of this in ~20min :)  
> >
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S
> 
> Of course it does, as commit
> 
> 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> 
> is reverted in linux-next.  The question is "Does the bluetooth tree
> build?" or "Does the net-next tree build *if* you merge the bluetooth
> tree into it?"

FWIW, I was able to built net-next with the commit yesterday.

---8<---
$ grep CONFIG_BT .config
CONFIG_BT=m
CONFIG_BT_BREDR=y
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_LE_L2CAP_ECRED=y
CONFIG_BT_LEDS=y
CONFIG_BT_MSFTEXT=y
CONFIG_BT_AOSPEXT=y
CONFIG_BT_DEBUGFS=y
CONFIG_BT_SELFTEST=y
CONFIG_BT_SELFTEST_ECDH=y
CONFIG_BT_SELFTEST_SMP=y
CONFIG_BT_FEATURE_DEBUG=y
CONFIG_BT_INTEL=m
CONFIG_BT_BCM=m
CONFIG_BT_RTL=m
CONFIG_BT_MTK=m
CONFIG_BT_HCIBTUSB=m
CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
CONFIG_BT_HCIBTUSB_POLL_SYNC=y
CONFIG_BT_HCIBTUSB_BCM=y
CONFIG_BT_HCIBTUSB_MTK=y
CONFIG_BT_HCIBTUSB_RTL=y
CONFIG_BT_HCIUART=m
CONFIG_BT_HCIUART_H4=y
CONFIG_BT_HCIUART_BCSP=y
CONFIG_BT_HCIUART_ATH3K=y
CONFIG_BT_HCIUART_AG6XX=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBCM4377=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
CONFIG_BT_HCIDTL1=m
CONFIG_BT_HCIBT3C=m
CONFIG_BT_HCIBLUECARD=m
CONFIG_BT_HCIVHCI=m
CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
CONFIG_BT_VIRTIO=m
---8<---

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

[Stephen Rothwell]

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

Hi Alexander,

On Thu, 20 Jul 2023 17:21:54 +0200 Alexander Mikhalitsyn <alexander@mihalicyn.com> wrote:
>
> On Thu, Jul 20, 2023 at 5:14 PM Jakub Kicinski <kuba@kernel.org> wrote:
> >
> > On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:  
> > > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > > not scm_recv_unix, so Id assume that change would return the initial
> > > > behavior, if it did not then it is not fixing anything.  
> > >
> > > Ack, that's what it seems like to me as well.
> > >
> > > I fired up an allmodconfig build of linux-next. I should be able
> > > to get to the bottom of this in ~20min :)  
> >
> > I kicked it off and forgot about it.
> > allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S  
> 
> Thanks for checking!
> 
> As I can see linux-next tree contains both patches:
> https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=next-20230719&qt=grep&q=Forward+credentials+to+monitor
> 
> So, the fix is working, right?

I will remove the revert today.

Thanks.
-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi Jakub,

On Thu, 20 Jul 2023 08:14:30 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:  
> > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > not scm_recv_unix, so Id assume that change would return the initial
> > > behavior, if it did not then it is not fixing anything.    
> > 
> > Ack, that's what it seems like to me as well.
> > 
> > I fired up an allmodconfig build of linux-next. I should be able 
> > to get to the bottom of this in ~20min :)  
> 
> I kicked it off and forgot about it.
> allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

Of course it does, as commit

817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")

is reverted in linux-next.  The question is "Does the bluetooth tree
build?" or "Does the net-next tree build *if* you merge the bluetooth
tree into it?"

-- 
Cheers,
Stephen Rothwell

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

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

[Alexander Mikhalitsyn]

On Thu, Jul 20, 2023 at 5:14 PM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> > On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > > Sorry for not replying inline, outlook on android, we use scm_recv
> > > not scm_recv_unix, so Id assume that change would return the initial
> > > behavior, if it did not then it is not fixing anything.
> >
> > Ack, that's what it seems like to me as well.
> >
> > I fired up an allmodconfig build of linux-next. I should be able
> > to get to the bottom of this in ~20min :)
>
> I kicked it off and forgot about it.
> allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

Dear Jakub,

Thanks for checking!

As I can see linux-next tree contains both patches:
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/?h=next-20230719&qt=grep&q=Forward+credentials+to+monitor

So, the fix is working, right?

Kind regards,
Alex

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

[Jakub Kicinski]

On Wed, 19 Jul 2023 20:24:35 -0700 Jakub Kicinski wrote:
> On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > Sorry for not replying inline, outlook on android, we use scm_recv
> > not scm_recv_unix, so Id assume that change would return the initial
> > behavior, if it did not then it is not fixing anything.  
> 
> Ack, that's what it seems like to me as well.
> 
> I fired up an allmodconfig build of linux-next. I should be able 
> to get to the bottom of this in ~20min :)

I kicked it off and forgot about it.
allmodconfig on 352ce39a8bbaec04 (next-20230719) builds just fine :S

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

[Alexander Mikhalitsyn]

On Thu, Jul 20, 2023 at 5:24 AM Jakub Kicinski <kuba@kernel.org> wrote:
>
> On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> > Sorry for not replying inline, outlook on android, we use scm_recv
> > not scm_recv_unix, so Id assume that change would return the initial
> > behavior, if it did not then it is not fixing anything.
>
> Ack, that's what it seems like to me as well.
>
> I fired up an allmodconfig build of linux-next. I should be able
> to get to the bottom of this in ~20min :)

Dear friends,

I'm here and ready to help with fixing this. As far as I understand
everything should work,
because in 817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
we have a call to scm_recv(sock, msg, &scm, flags). And scm_recv does
not use scm_pidfd_recv (and pidfd_prepare).

Please tell me if something is not working and which tree I should
take to reproduce it. I'm ready to dive into it.

Kind regards,
Alex

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

[Jakub Kicinski]

On Thu, 20 Jul 2023 03:17:37 +0000 Von Dentz, Luiz wrote:
> Sorry for not replying inline, outlook on android, we use scm_recv
> not scm_recv_unix, so Id assume that change would return the initial
> behavior, if it did not then it is not fixing anything.

Ack, that's what it seems like to me as well.

I fired up an allmodconfig build of linux-next. I should be able 
to get to the bottom of this in ~20min :)

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

[Stephen Rothwell]

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

Hi Jakub,

On Wed, 19 Jul 2023 18:24:39 -0700 Jakub Kicinski <kuba@kernel.org> wrote:
>
> Something weird. We did merge it, there was a sort-of-v2-called-v1:
> 
> https://lore.kernel.org/all/20230627174314.67688-1-kuniyu@amazon.com/
> 
> Merged as https://git.kernel.org/netdev/net-next/c/a9c49cc2f5b5

That is not the net-next tree in linux-next.  I have always used
git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main.

And the above commit is not in linux-next (yet?)

> Dunno how it's supposed to fix this particular issue, tho, on a closer
> look, as it still calls:
> 
>   scm_recv_unix() -> scm_pidfd_recv() -> pidfd_prepare()

Yeah, the bluetooth tree will need to change that after the above patch
is available to it.

-- 
Cheers,
Stephen Rothwell

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

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

[Jakub Kicinski]

On Thu, 20 Jul 2023 10:50:42 +1000 Stephen Rothwell wrote:
> Hi all,
> 
> On Sat, 8 Jul 2023 00:17:15 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
> >
> > There was a patch sent to net-next that was supposed to fix this:
> > 
> > [PATCH v1 net-next 2/2] net: scm: introduce and use scm_recv_unix helper
> > 
> > I am waiting for it to be merged.
> > 
> > 
> > ________________________________
> > From: Stephen Rothwell
> > Sent: Thursday, July 6, 2023 4:41 PM
> > To: Marcel Holtmann; Johan Hedberg
> > Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> > Subject: Re: linux-next: build failure after merge of the bluetooth tree
> > 
> > Hi all,
> > 
> > On Fri, 16 Jun 2023 08:32:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >
> > > On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:    
> > > >    
> > >  After merging the bluetooth tree, today's linux-next build (arm    
> > > > multi_v7_defconfig) failed like this:
> > > >
> > > > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> > > >
> > > > Caused by commit
> > > >
> > > >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > > >
> > > > I have reverted that commit for today.    
> > >
> > > I am still reverting that commit.    
> > 
> > Ditto  
> 
> This is getting a bit ridiculous ... a build failure reported over a
> month ago with a fix
> (https://lore.kernel.org/netdev/20230626215951.563715-1-aleksandr.mikhalitsyn@canonical.com)
> posted 3 weeks ago, has not yet been fixed :-(
> 
> What is stopping that fix (with the appropriate followup) being added
> to the bluetooth tree?  Or just the fix being added to the net-next tree?
> 
> Yes, I know that the time period includes the merge window, but it has
> been more that a week since then.

Something weird. We did merge it, there was a sort-of-v2-called-v1:

https://lore.kernel.org/all/20230627174314.67688-1-kuniyu@amazon.com/

Merged as https://git.kernel.org/netdev/net-next/c/a9c49cc2f5b5

Dunno how it's supposed to fix this particular issue, tho, on a closer
look, as it still calls:

  scm_recv_unix() -> scm_pidfd_recv() -> pidfd_prepare()

:S

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

[Stephen Rothwell]

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

Hi all,

On Sat, 8 Jul 2023 00:17:15 +0000 "Von Dentz, Luiz" <luiz.von.dentz@intel.com> wrote:
>
> There was a patch sent to net-next that was supposed to fix this:
> 
> [PATCH v1 net-next 2/2] net: scm: introduce and use scm_recv_unix helper
> 
> I am waiting for it to be merged.
> 
> 
> ________________________________
> From: Stephen Rothwell
> Sent: Thursday, July 6, 2023 4:41 PM
> To: Marcel Holtmann; Johan Hedberg
> Cc: Von Dentz, Luiz; Linux Kernel Mailing List; Linux Next Mailing List
> Subject: Re: linux-next: build failure after merge of the bluetooth tree
> 
> Hi all,
> 
> On Fri, 16 Jun 2023 08:32:37 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > On Tue, 13 Jun 2023 13:02:58 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:  
> > >  
> >  After merging the bluetooth tree, today's linux-next build (arm  
> > > multi_v7_defconfig) failed like this:
> > >
> > > ERROR: modpost: "pidfd_prepare" [net/bluetooth/bluetooth.ko] undefined!
> > >
> > > Caused by commit
> > >
> > >   817efd3cad74 ("Bluetooth: hci_sock: Forward credentials to monitor")
> > >
> > > I have reverted that commit for today.  
> >
> > I am still reverting that commit.  
> 
> Ditto

This is getting a bit ridiculous ... a build failure reported over a
month ago with a fix
(https://lore.kernel.org/netdev/20230626215951.563715-1-aleksandr.mikhalitsyn@canonical.com)
posted 3 weeks ago, has not yet been fixed :-(

What is stopping that fix (with the appropriate followup) being added
to the bluetooth tree?  Or just the fix being added to the net-next tree?

Yes, I know that the time period includes the merge window, but it has
been more that a week since then.
-- 
Cheers,
Stephen Rothwell

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

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 22 Sep 2015 11:20:15 +1000

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Cc: Alexander Aring <alex.aring@gmail.com>
> Cc: Stefan Schmidt <stefan@osg.samsung.com>
> Cc: Marcel Holtmann <marcel@holtmann.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Alexander Aring <alex.aring@gmail.com>

Applied, thanks.

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

[Stephen Rothwell]

Hi Gustavo,

On Mon, 14 Sep 2015 10:22:34 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Mon, 14 Sep 2015 10:14:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > I applied the patches that Andrew has had in his post merge series
> > (but I think you were sent a rolled up version):
> 
> Actually it was sent by Alexander to Marcel:
> 
> From: Alexander Aring <alex.aring@gmail.com>
> To: marcel@holtmann.org
> Cc: Andrew Morton <akpm@linux-foundation.org>,
> 	Stephen Rothwell <sfr@canb.auug.org.au>,
> 	Alexander Aring <alex.aring@gmail.com>,
> 	Stefan Schmidt <stefan@osg.samsung.com>
> Subject: [PATCH bluetooth-next] drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL
> Date: Fri, 11 Sep 2015 11:23:30 +0200
> Message-Id: <1441963410-24844-1-git-send-email-alex.aring@gmail.com>
> X-Mailer: git-send-email 2.5.1
> 
> From: Andrew Morton <akpm@linux-foundation.org>
> 
> I will shortly be sending
> http://ozlabs.org/~akpm/mmots/broken-out/fs-seq_file-convert-int-seq_vprint-seq_printf-etc-returns-to-void.patch
> to Linus.  This will cause the linux-next version of
> drivers/net/ieee802154/at86rf230.c to break at compilation time.
> 
> Below is the fix.  I suggest you apply this immediately.
> 
> Otherwise I'll try to remember to send this in after Alexander's
> 890acf8330cac is merged.  But there will be a window during which the
> build fails, and we'll get emails...
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

OK, this is now a problem for the net-next tree since the bluetooth
tree was merged there :-(

Can someone please apply this patch?

Hi Dave,

An x64_64 allmodconfig build after merging the next-next tree breaks in
linux-next due to the patch below not being applied to the bluetooth
tree.  I have been applying the equivalent to the bluetooth tree merge
in linux-next for a while now.

[Patch repeated for Dave - this is from and email from Andrew via
Alexander to Marcel which I forwarded to Gustavo]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Subject: drivers/net/ieee802154/at86rf230.c: seq_printf() now returns NULL

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alexander Aring <alex.aring@gmail.com>
Cc: Stefan Schmidt <stefan@osg.samsung.com>
Cc: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 drivers/net/ieee802154/at86rf230.c | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index b8b0628..9756e64 100644
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -1645,32 +1645,17 @@ static struct dentry *at86rf230_debugfs_root;
 static int at86rf230_stats_show(struct seq_file *file, void *offset)
 {
 	struct at86rf230_local *lp = file->private;
-	int ret;
-
-	ret = seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
-			 lp->trac.success_data_pending);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
-			 lp->trac.success_wait_for_ack);
-	if (ret < 0)
-		return ret;
-
-	ret = seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
-			 lp->trac.channel_access_failure);
-	if (ret < 0)
-		return ret;
 
-	ret = seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
-	if (ret < 0)
-		return ret;
-
-	return seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	seq_printf(file, "SUCCESS:\t\t%8llu\n", lp->trac.success);
+	seq_printf(file, "SUCCESS_DATA_PENDING:\t%8llu\n",
+		   lp->trac.success_data_pending);
+	seq_printf(file, "SUCCESS_WAIT_FOR_ACK:\t%8llu\n",
+		   lp->trac.success_wait_for_ack);
+	seq_printf(file, "CHANNEL_ACCESS_FAILURE:\t%8llu\n",
+		   lp->trac.channel_access_failure);
+	seq_printf(file, "NO_ACK:\t\t\t%8llu\n", lp->trac.no_ack);
+	seq_printf(file, "INVALID:\t\t%8llu\n", lp->trac.invalid);
+	return 0;
 }
 
 static int at86rf230_stats_open(struct inode *inode, struct file *file)
-- 
2.5.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au