Skip to content

Commit 6f79db0

Browse files
committed
staging: gpib: mite: remove unused global functions
The mite.c file was originally copied from the COMEDI code, and now that it is in the kernel tree, along with the comedi code, on some build configurations there are errors due to duplicate symbols (specifically mite_dma_disarm). Remove all of the unused functions in the gpib mite.c and .h files as they aren't needed and cause the compiler to be confused. Reported-by: kernel test robot <[email protected]> Closes: https://lore.kernel.org/r/[email protected]/ Reported-by: Stephen Rothwell <[email protected]> Link: https://lore.kernel.org/r/2025010809-padding-survive-91b3@gregkh Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 84b172c commit 6f79db0

File tree

2 files changed

+0
-78
lines changed

2 files changed

+0
-78
lines changed

drivers/staging/gpib/tnt4882/mite.c

Lines changed: 0 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -148,72 +148,3 @@ void mite_list_devices(void)
148148
}
149149
pr_info("\n");
150150
}
151-
152-
int mite_bytes_transferred(struct mite_struct *mite, int chan)
153-
{
154-
int dar, fcr;
155-
156-
dar = readl(mite->mite_io_addr + MITE_DAR + CHAN_OFFSET(chan));
157-
fcr = readl(mite->mite_io_addr + MITE_FCR + CHAN_OFFSET(chan)) & 0x000000FF;
158-
return dar - fcr;
159-
}
160-
161-
int mite_dma_tcr(struct mite_struct *mite)
162-
{
163-
int tcr;
164-
int lkar;
165-
166-
lkar = readl(mite->mite_io_addr + CHAN_OFFSET(0) + MITE_LKAR);
167-
tcr = readl(mite->mite_io_addr + CHAN_OFFSET(0) + MITE_TCR);
168-
MDPRINTK("lkar=0x%08x tcr=%d\n", lkar, tcr);
169-
170-
return tcr;
171-
}
172-
173-
void mite_dma_disarm(struct mite_struct *mite)
174-
{
175-
int chor;
176-
177-
/* disarm */
178-
chor = CHOR_ABORT;
179-
writel(chor, mite->mite_io_addr + CHAN_OFFSET(0) + MITE_CHOR);
180-
}
181-
182-
void mite_dump_regs(struct mite_struct *mite)
183-
{
184-
void *addr = 0;
185-
unsigned long temp = 0;
186-
187-
pr_info("mite address is =0x%p\n", mite->mite_io_addr);
188-
189-
addr = mite->mite_io_addr + MITE_CHOR + CHAN_OFFSET(0);
190-
pr_info("mite status[CHOR]at 0x%p =0x%08lx\n", addr, temp = readl(addr));
191-
//mite_decode(mite_CHOR_strings,temp);
192-
addr = mite->mite_io_addr + MITE_CHCR + CHAN_OFFSET(0);
193-
pr_info("mite status[CHCR]at 0x%p =0x%08lx\n", addr, temp = readl(addr));
194-
//mite_decode(mite_CHCR_strings,temp);
195-
addr = mite->mite_io_addr + MITE_TCR + CHAN_OFFSET(0);
196-
pr_info("mite status[TCR] at 0x%p =0x%08x\n", addr, readl(addr));
197-
addr = mite->mite_io_addr + MITE_MCR + CHAN_OFFSET(0);
198-
pr_info("mite status[MCR] at 0x%p =0x%08lx\n", addr, temp = readl(addr));
199-
//mite_decode(mite_MCR_strings,temp);
200-
addr = mite->mite_io_addr + MITE_MAR + CHAN_OFFSET(0);
201-
pr_info("mite status[MAR] at 0x%p =0x%08x\n", addr, readl(addr));
202-
addr = mite->mite_io_addr + MITE_DCR + CHAN_OFFSET(0);
203-
pr_info("mite status[DCR] at 0x%p =0x%08lx\n", addr, temp = readl(addr));
204-
//mite_decode(mite_CR_strings,temp);
205-
addr = mite->mite_io_addr + MITE_DAR + CHAN_OFFSET(0);
206-
pr_info("mite status[DAR] at 0x%p =0x%08x\n", addr, readl(addr));
207-
addr = mite->mite_io_addr + MITE_LKCR + CHAN_OFFSET(0);
208-
pr_info("mite status[LKCR]at 0x%p =0x%08lx\n", addr, temp = readl(addr));
209-
//mite_decode(mite_CR_strings,temp);
210-
addr = mite->mite_io_addr + MITE_LKAR + CHAN_OFFSET(0);
211-
pr_info("mite status[LKAR]at 0x%p =0x%08x\n", addr, readl(addr));
212-
213-
addr = mite->mite_io_addr + MITE_CHSR + CHAN_OFFSET(0);
214-
pr_info("mite status[CHSR]at 0x%p =0x%08lx\n", addr, temp = readl(addr));
215-
//mite_decode(mite_CHSR_strings,temp);
216-
addr = mite->mite_io_addr + MITE_FCR + CHAN_OFFSET(0);
217-
pr_info("mite status[FCR] at 0x%p =0x%08x\n\n", addr, readl(addr));
218-
}
219-

drivers/staging/gpib/tnt4882/mite.h

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,6 @@ int mite_setup(struct mite_struct *mite);
6161
void mite_unsetup(struct mite_struct *mite);
6262
void mite_list_devices(void);
6363

64-
int mite_dma_tcr(struct mite_struct *mite);
65-
66-
void mite_dma_arm(struct mite_struct *mite);
67-
void mite_dma_disarm(struct mite_struct *mite);
68-
69-
void mite_dump_regs(struct mite_struct *mite);
70-
void mite_setregs(struct mite_struct *mite, unsigned long ll_start, int chan, int dir);
71-
int mite_bytes_transferred(struct mite_struct *mite, int chan);
72-
7364
#define CHAN_OFFSET(x) (0x100 * (x))
7465

7566
/* DMA base for chan 0 is 0x500, chan 1 is 0x600 */

0 commit comments

Comments
 (0)