mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
7b56a937a1
On Saturday 09 February 2008, Adrian Bunk wrote:
> Commit 9e016a7192 causes the following
> compile error:
>
> <-- snip -->
>
> ...
> CC drivers/ide/arm/bast-ide.o
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c: In function 'bastide_register':
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:31: error: 'hwif' redeclared as different kind of symbol
> /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/ide/arm/bast-ide.c:29: error: previous definition of 'hwif' was here
> make[4]: *** [drivers/ide/arm/bast-ide.o] Error 1
>
> <-- snip -->
Remove 'ide_hwif_t **hwif' argument from bastide_register()
(together with write-only ifs[]).
Cc: Adrian Bunk <bunk@kernel.org>
Cc: Russell King <rmk@arm.linux.org.uk>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
85 lines
1.8 KiB
C
85 lines
1.8 KiB
C
/*
|
|
* Copyright (c) 2003-2004 Simtec Electronics
|
|
* Ben Dooks <ben@simtec.co.uk>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/ide.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/io.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/arch/map.h>
|
|
#include <asm/arch/bast-map.h>
|
|
#include <asm/arch/bast-irq.h>
|
|
|
|
static int __init bastide_register(unsigned int base, unsigned int aux, int irq)
|
|
{
|
|
ide_hwif_t *hwif;
|
|
hw_regs_t hw;
|
|
int i;
|
|
u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
|
|
|
|
memset(&hw, 0, sizeof(hw));
|
|
|
|
base += BAST_IDE_CS;
|
|
aux += BAST_IDE_CS;
|
|
|
|
for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {
|
|
hw.io_ports[i] = (unsigned long)base;
|
|
base += 0x20;
|
|
}
|
|
|
|
hw.io_ports[IDE_CONTROL_OFFSET] = aux + (6 * 0x20);
|
|
hw.irq = irq;
|
|
|
|
hwif = ide_deprecated_find_port(hw.io_ports[IDE_DATA_OFFSET]);
|
|
if (hwif == NULL)
|
|
goto out;
|
|
|
|
i = hwif->index;
|
|
|
|
if (hwif->present)
|
|
ide_unregister(i, 0, 0);
|
|
else if (!hwif->hold)
|
|
ide_init_port_data(hwif, i);
|
|
|
|
ide_init_port_hw(hwif, &hw);
|
|
hwif->quirkproc = NULL;
|
|
|
|
idx[0] = i;
|
|
|
|
ide_device_add(idx, NULL);
|
|
out:
|
|
return 0;
|
|
}
|
|
|
|
static int __init bastide_init(void)
|
|
{
|
|
/* we can treat the VR1000 and the BAST the same */
|
|
|
|
if (!(machine_is_bast() || machine_is_vr1000()))
|
|
return 0;
|
|
|
|
printk("BAST: IDE driver, (c) 2003-2004 Simtec Electronics\n");
|
|
|
|
bastide_register(BAST_VA_IDEPRI, BAST_VA_IDEPRIAUX, IRQ_IDE0);
|
|
bastide_register(BAST_VA_IDESEC, BAST_VA_IDESECAUX, IRQ_IDE1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
module_init(bastide_init);
|
|
|
|
MODULE_AUTHOR("Ben Dooks <ben@simtec.co.uk>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("Simtec BAST / Thorcom VR1000 IDE driver");
|