Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59b25ed9 authored by Morten H. Larsen's avatar Morten H. Larsen Committed by Matt Turner
Browse files

Fix call to replaced SuperIO functions 



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: default avatarMichael Cree <mcree@orcon.net.nz>
Signed-off-by: default avatarMorten H. Larsen <m-larsen@post6.tele.dk>
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 6445671b

arch/alpha/kernel/proto.h

+0 −3
Original line number Diff line number Diff line
@@ -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);

arch/alpha/kernel/sys_cabriolet.c

+16 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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();

}



/*

arch/alpha/kernel/sys_takara.c

+9 −2
Original line number Diff line number Diff line
@@ -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 };
@@ -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();

	}

}