Skip to content

Commit

Permalink
Fix call to replaced SuperIO functions
Browse files Browse the repository at this point in the history
This patch fixes the failure to compile Alpha Generic because of
previously overlooked calls to ns87312_enable_ide(). The function has
been replaced by newer SuperIO code.

Tested-by: Michael Cree <[email protected]>
Signed-off-by: Morten H. Larsen <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
  • Loading branch information
Morten H. Larsen authored and mattst88 committed Sep 1, 2010
1 parent 6445671 commit 59b25ed
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 8 deletions.
3 changes: 0 additions & 3 deletions arch/alpha/kernel/proto.h
Original file line number Diff line number Diff line change
Expand Up @@ -156,9 +156,6 @@ extern void SMC669_Init(int);
/* es1888.c */
extern void es1888_init(void);

/* ns87312.c */
extern void ns87312_enable_ide(long ide_base);

/* ../lib/fpreg.c */
extern void alpha_write_fp_reg (unsigned long reg, unsigned long val);
extern unsigned long alpha_read_fp_reg (unsigned long reg);
Expand Down
19 changes: 16 additions & 3 deletions arch/alpha/kernel/sys_cabriolet.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "irq_impl.h"
#include "pci_impl.h"
#include "machvec_impl.h"

#include "pc873xx.h"

/* Note mask bit is true for DISABLED irqs. */
static unsigned long cached_irq_mask = ~0UL;
Expand Down Expand Up @@ -235,18 +235,31 @@ cabriolet_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
return COMMON_TABLE_LOOKUP;
}

static inline void __init
cabriolet_enable_ide(void)
{
if (pc873xx_probe() == -1) {
printk(KERN_ERR "Probing for PC873xx Super IO chip failed.\n");
} else {
printk(KERN_INFO "Found %s Super IO chip at 0x%x\n",
pc873xx_get_model(), pc873xx_get_base());

pc873xx_enable_ide();
}
}

static inline void __init
cabriolet_init_pci(void)
{
common_init_pci();
ns87312_enable_ide(0x398);
cabriolet_enable_ide();
}

static inline void __init
cia_cab_init_pci(void)
{
cia_init_pci();
ns87312_enable_ide(0x398);
cabriolet_enable_ide();
}

/*
Expand Down
11 changes: 9 additions & 2 deletions arch/alpha/kernel/sys_takara.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "irq_impl.h"
#include "pci_impl.h"
#include "machvec_impl.h"

#include "pc873xx.h"

/* Note mask bit is true for DISABLED irqs. */
static unsigned long cached_irq_mask[2] = { -1, -1 };
Expand Down Expand Up @@ -264,7 +264,14 @@ takara_init_pci(void)
alpha_mv.pci_map_irq = takara_map_irq_srm;

cia_init_pci();
ns87312_enable_ide(0x26e);

if (pc873xx_probe() == -1) {
printk(KERN_ERR "Probing for PC873xx Super IO chip failed.\n");
} else {
printk(KERN_INFO "Found %s Super IO chip at 0x%x\n",
pc873xx_get_model(), pc873xx_get_base());
pc873xx_enable_ide();
}
}


Expand Down

0 comments on commit 59b25ed

Please sign in to comment.