projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Staging: pata_rdc: remove function prototypes
[cascardo/linux.git]
/
drivers
/
ide
/
ide-legacy.c
diff --git
a/drivers/ide/ide-legacy.c
b/drivers/ide/ide-legacy.c
index
8c5dcbf
..
b9654a7
100644
(file)
--- a/
drivers/ide/ide-legacy.c
+++ b/
drivers/ide/ide-legacy.c
@@
-1,7
+1,7
@@
#include <linux/kernel.h>
#include <linux/ide.h>
#include <linux/kernel.h>
#include <linux/ide.h>
-static void ide_legacy_init_one(
hw_regs_t **hws, hw_regs_t
*hw,
+static void ide_legacy_init_one(
struct ide_hw **hws, struct ide_hw
*hw,
u8 port_no, const struct ide_port_info *d,
unsigned long config)
{
u8 port_no, const struct ide_port_info *d,
unsigned long config)
{
@@
-33,7
+33,6
@@
static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw,
ide_std_init_ports(hw, base, ctl);
hw->irq = irq;
ide_std_init_ports(hw, base, ctl);
hw->irq = irq;
- hw->chipset = d->chipset;
hw->config = config;
hws[port_no] = hw;
hw->config = config;
hws[port_no] = hw;
@@
-41,7
+40,7
@@
static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw,
int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
{
int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
{
-
hw_regs_t hw[2], *hws[] = { NULL, NULL,
NULL, NULL };
+
struct ide_hw hw[2], *hws[] = {
NULL, NULL };
memset(&hw, 0, sizeof(hw));
memset(&hw, 0, sizeof(hw));
@@
-53,6
+52,6
@@
int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
(d->host_flags & IDE_HFLAG_SINGLE))
return -ENOENT;
(d->host_flags & IDE_HFLAG_SINGLE))
return -ENOENT;
- return ide_host_add(d, hws, NULL);
+ return ide_host_add(d, hws,
2,
NULL);
}
EXPORT_SYMBOL_GPL(ide_legacy_device_add);
}
EXPORT_SYMBOL_GPL(ide_legacy_device_add);