From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Lukas Bulwahn <lukas.bulwahn@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the staging.current tree
Date: Wed, 8 Jan 2025 21:42:40 +1100 [thread overview]
Message-ID: <20250108214240.482e0ca5@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2194 bytes --]
Hi all,
After merging the staging.current tree, today's linux-next build (powerpc
allyesconfig) failed like this:
ld: drivers/staging/gpib/tnt4882/mite.o: in function `mite_dma_disarm':
mite.c:(.text+0x1240): multiple definition of `mite_dma_disarm'; drivers/comedi/drivers/mite.o:mite.c:(.text+0x1ac0): first defined here
Exposed by commit
84b172cea4a2 ("staging: gpib: refer to correct config symbol in tnt4882 Makefile")
It is not, of course, the real cause of the build failure. The duplicate
version of mite_dma_disarm() in drivers/staging/gpib/tnt4882/mite.c is
not actually used anywhere, so I applied the following patch for today.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Wed, 8 Jan 2025 21:07:23 +1100
Subject: [PATCH] fix for "staging: gpib: refer to correct config symbol in
tnt4882 Makefile"
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/staging/gpib/tnt4882/mite.c | 9 ---------
drivers/staging/gpib/tnt4882/mite.h | 1 -
2 files changed, 10 deletions(-)
diff --git a/drivers/staging/gpib/tnt4882/mite.c b/drivers/staging/gpib/tnt4882/mite.c
index 90341f8c394e..22035e53ec35 100644
--- a/drivers/staging/gpib/tnt4882/mite.c
+++ b/drivers/staging/gpib/tnt4882/mite.c
@@ -170,15 +170,6 @@ int mite_dma_tcr(struct mite_struct *mite)
return tcr;
}
-void mite_dma_disarm(struct mite_struct *mite)
-{
- int chor;
-
- /* disarm */
- chor = CHOR_ABORT;
- writel(chor, mite->mite_io_addr + CHAN_OFFSET(0) + MITE_CHOR);
-}
-
void mite_dump_regs(struct mite_struct *mite)
{
void *addr = 0;
diff --git a/drivers/staging/gpib/tnt4882/mite.h b/drivers/staging/gpib/tnt4882/mite.h
index 2ecd83379974..dbfc59468228 100644
--- a/drivers/staging/gpib/tnt4882/mite.h
+++ b/drivers/staging/gpib/tnt4882/mite.h
@@ -64,7 +64,6 @@ void mite_list_devices(void);
int mite_dma_tcr(struct mite_struct *mite);
void mite_dma_arm(struct mite_struct *mite);
-void mite_dma_disarm(struct mite_struct *mite);
void mite_dump_regs(struct mite_struct *mite);
void mite_setregs(struct mite_struct *mite, unsigned long ll_start, int chan, int dir);
--
2.45.2
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-01-08 10:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-08 10:42 Stephen Rothwell [this message]
2025-01-08 11:48 ` linux-next: build failure after merge of the staging.current tree Greg KH
-- strict thread matches above, loose matches on Subject: below --
2017-12-14 6:00 Stephen Rothwell
2017-12-14 7:27 ` Greg KH
2011-06-08 1:41 Stephen Rothwell
2011-06-08 16:11 ` Greg KH
2011-06-08 16:58 ` Mauro Carvalho Chehab
2011-06-08 16:21 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250108214240.482e0ca5@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lukas.bulwahn@redhat$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox