This fixes most warnings I see on SPARC. There are some more (and using
gcc-2.96 gives _loads_ of them!), will try to fix the rest later.
The wrong types of the callbacks in drivers/sbus/audio/amd7930.c trouble me
a bit.
--- linux-2.4.0-test/kernel/signal.c.dist-2.4.0-test8-pre1 Tue Aug 29 18:27:38 2000
+++ linux-2.4.0-test/kernel/signal.c Tue Aug 29 18:27:46 2000
@@ -364,7 +364,6 @@
recalc_sigpending(t);
break;
}
- return 0;
}
static int deliver_signal(int sig, struct siginfo *info, struct task_struct *t)
--- linux-2.4.0-test/include/asm-sparc/sbus.h.dist-2.4.0-test8-pre1 Tue Aug 29 18:09:13 2000
+++ linux-2.4.0-test/include/asm-sparc/sbus.h Tue Aug 29 18:09:20 2000
@@ -112,7 +112,7 @@
/* All the rest use streaming mode mappings. */
extern u32 sbus_map_single(struct sbus_dev *, void *, long, int);
-extern void sbus_unmap_single(struct sbus_dev *, u32, long, int);
+extern void sbus_unmap_single(struct sbus_dev *, dma_addr_t, size_t, int);
extern int sbus_map_sg(struct sbus_dev *, struct scatterlist *, int, int);
extern void sbus_unmap_sg(struct sbus_dev *, struct scatterlist *, int, int);
--- linux-2.4.0-test/drivers/sbus/audio/amd7930.c.dist-2.4.0-test8-pre1 Tue Aug 29 15:03:23 2000
+++ linux-2.4.0-test/drivers/sbus/audio/amd7930.c Tue Aug 29 15:32:40 2000
@@ -140,7 +140,7 @@
u8 xmit_idle_char;
/* Callback routine (and argument) when output is done on */
- void (*output_callback)(void *, unsigned char);
+ void (*output_callback)(void *, int);
void * output_callback_arg;
/* Current buffer that the driver is recording on channel */
@@ -149,7 +149,7 @@
volatile u32 input_limit;
/* Callback routine (and argument) when input is done on */
- void (*input_callback)(void *, unsigned char, unsigned long);
+ void (*input_callback)(void *, int, unsigned int);
void * input_callback_arg;
int input_format;
@@ -1156,7 +1156,7 @@
return info->liu_state;
}
-static void amd7930_liu_init(int dev, void (*callback)(), void *callback_arg)
+static void amd7930_liu_init(int dev, void (*callback)(void *), void *callback_arg)
{
struct amd7930_info *info;
unsigned long flags;
@@ -1242,7 +1242,8 @@
}
static void amd7930_dxmit(int dev, __u8 *buffer, unsigned int count,
- void (*callback)(void *), void *callback_arg)
+ void (*callback)(void *, int),
+ void *callback_arg)
{
struct amd7930_info *info;
unsigned long flags;
@@ -1286,7 +1287,7 @@
}
static void amd7930_drecv(int dev, __u8 *buffer, unsigned int size,
- void (*callback)(void *),
+ void (*callback)(void *, int, unsigned int),
void *callback_arg)
{
struct amd7930_info *info;
--- linux-2.4.0-test/drivers/sbus/audio/dbri.c.dist-2.4.0-test8-pre1 Fri Feb 18 20:07:20 2000
+++ linux-2.4.0-test/drivers/sbus/audio/dbri.c Tue Aug 29 18:03:03 2000
@@ -2228,7 +2228,6 @@
{
struct dbri *dbri;
struct linux_prom_irqs irq;
- __u32 dma_dvma;
int err;
if (sdev->prom_name[9] < 'e') {
--- linux-2.4.0-test/arch/sparc/mm/init.c.dist-2.4.0-test8-pre1 Thu Aug 24 09:51:33 2000
+++ linux-2.4.0-test/arch/sparc/mm/init.c Tue Aug 29 14:50:40 2000
@@ -89,8 +89,6 @@
void __init kmap_init(void)
{
- unsigned long pteval;
-
/* cache the first kmap pte */
kmap_pte = kmap_get_fixed_pte(FIX_KMAP_BEGIN);
kmap_prot = __pgprot(SRMMU_ET_PTE | SRMMU_PRIV | SRMMU_CACHE);
-- Dr. Horst H. von Brand mailto:vonbrand@inf.utfsm.cl Departamento de Informatica Fono: +56 32 654431 Universidad Tecnica Federico Santa Maria +56 32 654239 Casilla 110-V, Valparaiso, Chile Fax: +56 32 797513 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Thu Aug 31 2000 - 21:00:24 EST