[parisc-linux-cvs] linux deller (2.4.18-pa19)
Helge Deller
deller@gmx.de
Sun, 14 Apr 2002 00:12:09 +0200
--------------Boundary-00=_9O1JS8INL3D5UCJFDB8X
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 8bit
On Sunday 14 April 2002 00:12, Helge Deller wrote:
> CVSROOT: /var/cvs
> Module name: linux
> Changes by: deller 02/04/13 16:12:27
>
> Modified files:
> . : Makefile
> arch/parisc/kernel: cache.c ccio-dma.c drivers.c irq.c lba_pci.c
> pdc_cons.c superio.c traps.c
> drivers/gsc : dino.c eisa.c
> drivers/net : pcnet32.c
> include/asm-parisc: eisa_bus.h hardware.h
>
> Log message:
> 2.4.18-pa19:
> - fixed some compiler warnings (unused variables and functions, wrong
> argument types, ...) - added some more fixes to pcnet32.c (new version
> 1.27b)
--------------Boundary-00=_9O1JS8INL3D5UCJFDB8X
Content-Type: text/plain;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="diff"
Index: Makefile
===================================================================
RCS file: /var/cvs/linux/Makefile,v
retrieving revision 1.289
diff -u -p -r1.289 Makefile
--- Makefile 2002/04/13 19:18:08 1.289
+++ Makefile 2002/04/13 21:56:47
@@ -1,7 +1,7 @@
VERSION = 2
PATCHLEVEL = 4
SUBLEVEL = 18
-EXTRAVERSION = -pa18
+EXTRAVERSION = -pa19
KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
Index: arch/parisc/kernel/cache.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/cache.c,v
retrieving revision 1.21
diff -u -p -r1.21 cache.c
--- arch/parisc/kernel/cache.c 2002/04/05 08:02:02 1.21
+++ arch/parisc/kernel/cache.c 2002/04/13 21:56:52
@@ -113,8 +113,6 @@ show_cache_info(struct seq_file *m)
void __init
cache_init(void)
{
- long capabilities;
-
if(pdc_cache_info(&cache_info)<0)
panic("cache_init: pdc_cache_info failed");
Index: arch/parisc/kernel/ccio-dma.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/ccio-dma.c,v
retrieving revision 1.52
diff -u -p -r1.52 ccio-dma.c
--- arch/parisc/kernel/ccio-dma.c 2002/02/28 07:15:36 1.52
+++ arch/parisc/kernel/ccio-dma.c 2002/04/13 21:56:55
@@ -1458,13 +1458,12 @@ static void __init ccio_init_resources(s
(unsigned long)&ioc->ioc_hpa->io_io_low_hv);
}
-static struct resource *expand_ioc_area(struct ioc *ioc, unsigned long size,
+static void expand_ioc_area(struct ioc *ioc, unsigned long size,
unsigned long min, unsigned long max, unsigned long align)
{
#ifdef NASTY_HACK_FOR_K_CLASS
__raw_writel(0xfffff600, (unsigned long)&(ioc->ioc_hpa->io_io_high));
ioc->mmio_region[0].end = 0xf5ffffff;
- return ioc->mmio_region;
#endif
}
Index: arch/parisc/kernel/drivers.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/drivers.c,v
retrieving revision 1.46
diff -u -p -r1.46 drivers.c
--- arch/parisc/kernel/drivers.c 2002/04/05 08:02:02 1.46
+++ arch/parisc/kernel/drivers.c 2002/04/13 21:56:55
@@ -224,7 +224,7 @@ static struct parisc_device *find_device
* Walks up the device tree looking for a device of the specified type.
* If it finds it, it returns it. If not, it returns NULL.
*/
-struct parisc_device *find_pa_parent_type(const struct parisc_device *dev, int type)
+const struct parisc_device *find_pa_parent_type(const struct parisc_device *dev, int type)
{
while (dev != &root) {
if (dev->id.hw_type == type)
Index: arch/parisc/kernel/irq.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/irq.c,v
retrieving revision 1.52
diff -u -p -r1.52 irq.c
--- arch/parisc/kernel/irq.c 2002/04/12 07:43:34 1.52
+++ arch/parisc/kernel/irq.c 2002/04/13 21:56:57
@@ -382,7 +382,6 @@ void do_irq(struct irqaction *action, in
void do_cpu_irq_mask(unsigned long mask, struct irq_region *region, struct pt_regs *regs)
{
unsigned long bit;
- unsigned long orig_eiem;
int irq;
#ifdef DEBUG_IRQ
Index: arch/parisc/kernel/lba_pci.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/lba_pci.c,v
retrieving revision 1.50
diff -u -p -r1.50 lba_pci.c
--- arch/parisc/kernel/lba_pci.c 2002/04/05 08:02:02 1.50
+++ arch/parisc/kernel/lba_pci.c 2002/04/13 21:56:59
@@ -1238,7 +1238,7 @@ lba_hw_init(struct lba_device *d)
u32 bus_reset; /* PDC_PAT_BUG */
#if 1
- printk(KERN_DEBUG "LBA %p STAT_CTL %Lx ERROR_CFG %Lx STATUS %Lx DMA_CTL %Lx\n",
+ printk(KERN_DEBUG "LBA %lu STAT_CTL %Lx ERROR_CFG %Lx STATUS %Lx DMA_CTL %Lx\n",
d->hba.base_addr,
READ_REG64(d->hba.base_addr + LBA_STAT_CTL),
READ_REG64(d->hba.base_addr + LBA_ERROR_CONFIG),
Index: arch/parisc/kernel/pdc_cons.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/pdc_cons.c,v
retrieving revision 1.30
diff -u -p -r1.30 pdc_cons.c
--- arch/parisc/kernel/pdc_cons.c 2001/11/29 08:30:08 1.30
+++ arch/parisc/kernel/pdc_cons.c 2002/04/13 21:56:59
@@ -51,10 +51,12 @@ static int pdc_console_setup(struct cons
return 0;
}
+#ifdef CONFIG_PDC_CONSOLE
static kdev_t pdc_console_device (struct console *c)
{
return MKDEV(PDCCONS_MAJOR, 0);
}
+#endif
#ifdef CONFIG_PDC_CONSOLE
#define PDC_CONSOLE_DEVICE pdc_console_device
Index: arch/parisc/kernel/superio.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/superio.c,v
retrieving revision 1.19
diff -u -p -r1.19 superio.c
--- arch/parisc/kernel/superio.c 2002/02/15 22:30:14 1.19
+++ arch/parisc/kernel/superio.c 2002/04/13 21:57:00
@@ -242,10 +242,10 @@ superio_init(struct superio_device *sio)
/* Setup USB power regulation */
outb(1, sio->acpi_base + USB_REG_CR);
- if (inb(sio->acpi_base + USB_REG_CR) & 1 != 1)
- printk(KERN_ERR "USB regulator not initialized!\n");
+ if (inb(sio->acpi_base + USB_REG_CR) & 1)
+ printk(KERN_INFO "SuperIO: USB regulator enabled\n");
else
- printk (KERN_INFO "SuperIO: USB regulator enabled\n");
+ printk(KERN_ERR "USB regulator not initialized!\n");
pci_enable_device(pdev);
Index: arch/parisc/kernel/traps.c
===================================================================
RCS file: /var/cvs/linux/arch/parisc/kernel/traps.c,v
retrieving revision 1.62
diff -u -p -r1.62 traps.c
--- arch/parisc/kernel/traps.c 2002/04/06 22:14:57 1.62
+++ arch/parisc/kernel/traps.c 2002/04/13 21:57:02
@@ -173,7 +173,7 @@ void show_stack(struct pt_regs *regs)
if (stack_start != cr30) {
printk(KERN_CRIT "WARNING! Interrupt-Stack pointer and cr30 do not correspond!\n");
printk(KERN_CRIT "Dumping virtual address stack instead\n");
- dump_stack(__va(stack_start), __va(sp), 0);
+ dump_stack((unsigned long)__va(stack_start), (unsigned long)__va(sp), 0);
} else {
dump_stack(stack_start, sp, 0);
};
@@ -192,7 +192,7 @@ void show_stack(struct pt_regs *regs)
/* Stack Dump! */
printk(KERN_CRIT "WARNING! Stack pointer and cr30 do not correspond!\n");
printk(KERN_CRIT "Dumping virtual address stack instead\n");
- dump_stack(__va(stack_start), __va(sp), 0);
+ dump_stack((unsigned long)__va(stack_start), (unsigned long)__va(sp), 0);
}
}
#endif
Index: drivers/gsc/dino.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/dino.c,v
retrieving revision 1.60
diff -u -p -r1.60 dino.c
--- drivers/gsc/dino.c 2002/04/07 21:11:46 1.60
+++ drivers/gsc/dino.c 2002/04/13 21:57:05
@@ -466,7 +466,7 @@ dino_bios_init(void)
* Claim an 8MB chunk of unused IO space and call the generic PCI routines
* to set up the addresses of the devices on this bus.
*/
-#define _8MB 0x00800000
+#define _8MB 0x00800000UL
static void __init
dino_card_setup(struct pci_bus *bus, unsigned long base_addr)
{
@@ -478,7 +478,8 @@ dino_card_setup(struct pci_bus *bus, uns
res->flags = IORESOURCE_MEM;
if (ccio_allocate_resource(dino_dev->hba.dev, res, _8MB,
- 0xfffffffff0000000 | _8MB, 0xffffffffffffffff &~ _8MB, _8MB,
+ (unsigned long) 0xfffffffff0000000UL | _8MB,
+ 0xffffffffffffffffUL &~ _8MB, _8MB,
NULL, NULL) < 0) {
printk(KERN_WARNING "Dino: Failed to allocate memory region\n");
return;
@@ -488,7 +489,7 @@ dino_card_setup(struct pci_bus *bus, uns
/* Now tell dino what range it has */
for (i = 1; i < 31; i++) {
- if (res->start == (0xfffffffff0000000 | i * _8MB))
+ if (res->start == (0xfffffffff0000000UL | i * _8MB))
break;
}
gsc_writel(1 << i, base_addr + DINO_IO_ADDR_EN);
Index: drivers/gsc/eisa.c
===================================================================
RCS file: /var/cvs/linux/drivers/gsc/eisa.c,v
retrieving revision 1.18
diff -u -p -r1.18 eisa.c
--- drivers/gsc/eisa.c 2002/03/25 22:11:40 1.18
+++ drivers/gsc/eisa.c 2002/04/13 21:57:05
@@ -371,7 +371,7 @@ static int __devinit eisa_probe(struct p
eisa_dev.eeprom_addr = MIRAGE_EEPROM_BASE_ADDR;
}
}
- eisa_eeprom_init (eisa_dev.eeprom_addr);
+ eisa_eeprom_init(eisa_dev.eeprom_addr);
eisa_enumerator(eisa_dev.eeprom_addr, &eisa_dev.hba.io_space, &eisa_dev.hba.lmmio_space);
init_eisa_pic();
Index: drivers/net/pcnet32.c
===================================================================
RCS file: /var/cvs/linux/drivers/net/pcnet32.c,v
retrieving revision 1.19
diff -u -p -r1.19 pcnet32.c
--- drivers/net/pcnet32.c 2002/04/13 19:14:31 1.19
+++ drivers/net/pcnet32.c 2002/04/13 21:57:13
@@ -1,5 +1,5 @@
-/* pcnet32.c: An AMD PCnet32 ethernet driver for linux. */
-/*
+/* pcnet32.c: An AMD PCnet32 ethernet driver for linux.
+ *
* Copyright 1996-1999 Thomas Bogendoerfer
*
* Derived from the lance driver written 1993,1994,1995 by Donald Becker.
@@ -11,24 +11,14 @@
* of the GNU General Public License, incorporated herein by reference.
*
* This driver is for PCnet32 and PCnetPCI based ethercards
- */
-/**************************************************************************
- * 23 Oct, 2000.
- * Fixed a few bugs, related to running the controller in 32bit mode.
- *
- * Carsten Langgaard, carstenl@mips.com
- * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
*
- *************************************************************************/
+ **************************************************************************/
#define DRV_NAME "pcnet32"
-#define DRV_VERSION "1.27a"
-#define DRV_RELDATE "10.02.2002"
+#define DRV_VERSION "1.27b"
+#define DRV_RELDATE "13.04.2002"
#define PFX DRV_NAME ": "
-static const char *version =
-DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
-
#include <linux/module.h>
#include <linux/kernel.h>
@@ -55,6 +45,9 @@ DRV_NAME ".c:v" DRV_VERSION " " DRV_RELD
#include <linux/skbuff.h>
#include <linux/spinlock.h>
+static const char version[] __devinitdata =
+DRV_NAME ".c:v" DRV_VERSION " " DRV_RELDATE " tsbogend@alpha.franken.de\n";
+
/*
* PCI device identifiers for "new style" Linux PCI Device Drivers
*/
@@ -199,7 +192,7 @@ static int full_duplex[MAX_UNITS];
* v1.25kf Added No Interrupt on successful Tx for some Tx's <kaf@fc.hp.com>
* v1.26 Converted to pci_alloc_consistent, Jamey Hicks / George France
* <jamey@crl.dec.com>
- * - Fixed a few bugs, related to running the controller in 32bit mode.
+ * v1.26a Fixed a few bugs, related to running the controller in 32bit mode.
* 23 Oct, 2000. Carsten Langgaard, carstenl@mips.com
* Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved.
* v1.26p Fix oops on rmmod+insmod; plug i/o resource leak - Paul Gortmaker
@@ -212,6 +205,8 @@ static int full_duplex[MAX_UNITS];
* fix pci probe not increment cards_found
* FD auto negotiate error workaround for xSeries250
* clean up and using new mii module
+ * v1.27b Sat Apr 13 2002 Helge Deller <deller@gmx.de>
+ * typo-fixes & cleanups
*/
@@ -1700,7 +1695,8 @@ static int __init pcnet32_init_module(vo
pcnet32_probe_vlbus();
if (cards_found)
- printk(KERN_INFO PFX "%d cards_found.\n", cards_found);
+ printk(KERN_INFO PFX "%d card%s found.\n", cards_found,
+ cards_found==1 ? "":"s");
return cards_found ? 0 : -ENODEV;
}
Index: include/asm-parisc/eisa_bus.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/eisa_bus.h,v
retrieving revision 1.1
diff -u -p -r1.1 eisa_bus.h
--- include/asm-parisc/eisa_bus.h 2002/02/24 16:27:31 1.1
+++ include/asm-parisc/eisa_bus.h 2002/04/13 21:57:29
@@ -18,5 +18,6 @@ extern void eisa_make_irq_edge(int num);
extern int eisa_enumerator(unsigned long eeprom_addr,
struct resource *io_parent,
struct resource *mem_parent);
+extern int eisa_eeprom_init(unsigned long addr);
#endif
Index: include/asm-parisc/hardware.h
===================================================================
RCS file: /var/cvs/linux/include/asm-parisc/hardware.h,v
retrieving revision 1.37
diff -u -p -r1.37 hardware.h
--- include/asm-parisc/hardware.h 2002/04/05 08:02:02 1.37
+++ include/asm-parisc/hardware.h 2002/04/13 21:57:29
@@ -145,7 +145,7 @@ extern void walk_central_bus(void);
extern void fixup_child_irqs(struct parisc_device *parent, int irqbase,
int (*choose)(struct parisc_device *parent));
extern void print_subdevices(struct parisc_device *dev);
-extern struct parisc_device *find_pa_parent_type(const struct parisc_device *, int);
+extern const struct parisc_device *find_pa_parent_type(const struct parisc_device *, int);
extern void print_parisc_devices(void);
extern char *print_pa_hwpath(struct parisc_device *dev, char *path);
extern char *print_pci_hwpath(struct pci_dev *dev, char *path);
--------------Boundary-00=_9O1JS8INL3D5UCJFDB8X--