1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index c06ebdc4a130..520f42c5445a 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -64,26 +64,26 @@ static const struct ide_tp_ops h8300_tp_ops = {
 
 #define H8300_IDE_GAP (2)
 
-static inline void hw_setup(hw_regs_t *hw)
+static inline void hw_setup(struct ide_hw *hw)
 {
         int i;
 
-        memset(hw, 0, sizeof(hw_regs_t));
+        memset(hw, 0, sizeof(*hw));
         for (i = 0; i <= 7; i++)
                 hw->io_ports_array[i] = CONFIG_H8300_IDE_BASE + H8300_IDE_GAP*i;
         hw->io_ports.ctl_addr = CONFIG_H8300_IDE_ALT;
         hw->irq = EXT_IRQ0 + CONFIG_H8300_IDE_IRQ;
-        hw->chipset = ide_generic;
 }
 
 static const struct ide_port_info h8300_port_info = {
         .tp_ops                 = &h8300_tp_ops,
         .host_flags             = IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_NO_DMA,
+        .chipset                = ide_generic,
 };
 
 static int __init h8300_ide_init(void)
 {
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        struct ide_hw hw, *hws[] = { &hw };
 
         printk(KERN_INFO DRV_NAME ": H8/300 generic IDE interface\n");
 
@@ -96,7 +96,7 @@ static int __init h8300_ide_init(void)
 
         hw_setup(&hw);
 
-        return ide_host_add(&h8300_port_info, hws, NULL);
+        return ide_host_add(&h8300_port_info, hws, 1, NULL);
 
 out_busy:
         printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n");