lkml.org 
[lkml]   [2010]   [Sep]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[71/80] Fix call to replaced SuperIO functions
    2.6.35-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Morten H. Larsen <m-larsen@post6.tele.dk>

    commit 59b25ed91400ace98d6cf0d59b1cb6928ad5cd37 upstream.

    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 <mcree@orcon.net.nz>
    Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/alpha/kernel/proto.h | 3 ---
    arch/alpha/kernel/sys_cabriolet.c | 19 ++++++++++++++++---
    arch/alpha/kernel/sys_takara.c | 11 +++++++++--
    3 files changed, 25 insertions(+), 8 deletions(-)

    --- a/arch/alpha/kernel/proto.h
    +++ b/arch/alpha/kernel/proto.h
    @@ -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);
    --- a/arch/alpha/kernel/sys_cabriolet.c
    +++ b/arch/alpha/kernel/sys_cabriolet.c
    @@ -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;
    @@ -236,17 +236,30 @@ cabriolet_map_irq(struct pci_dev *dev, u
    }

    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();
    }

    /*
    --- a/arch/alpha/kernel/sys_takara.c
    +++ b/arch/alpha/kernel/sys_takara.c
    @@ -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();
    + }
    }





    \
     
     \ /
      Last update: 2010-09-27 20:09    [W:2.205 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site