Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Conflicts:
	drivers/hwmon/coretemp.c

diff --combined drivers/hwmon/coretemp.c
index 2e5e2dc47eafdca62ae3513bee1e471cbdb1276d,be58da122c9699ef4af196913ba6d8a3e5da5f64..78be66176840d1c6abdf29dd632d7a107f6ad2d3
--- 1/drivers/hwmon/coretemp.c
--- 2/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@@ -195,7 -195,7 +195,7 @@@ struct tjmax 
        int tjmax;
  };
  
 -static const struct tjmax __cpuinitconst tjmax_table[] = {
 +static const struct tjmax tjmax_table[] = {
        { "CPU  230", 100000 },         /* Model 0x1c, stepping 2       */
        { "CPU  330", 125000 },         /* Model 0x1c, stepping 2       */
        { "CPU CE4110", 110000 },       /* Model 0x1c, stepping 10 Sodaville */
@@@ -211,7 -211,7 +211,7 @@@ struct tjmax_model 
  
  #define ANY 0xff
  
 -static const struct tjmax_model __cpuinitconst tjmax_model_table[] = {
 +static const struct tjmax_model tjmax_model_table[] = {
        { 0x1c, 10, 100000 },   /* D4xx, K4xx, N4xx, D5xx, K5xx, N5xx */
        { 0x1c, ANY, 90000 },   /* Z5xx, N2xx, possibly others
                                 * Note: Also matches 230 and 330,
@@@ -226,7 -226,8 +226,7 @@@
        { 0x36, ANY, 100000 },  /* Atom Cedar Trail/Cedarview (N2xxx, D2xxx) */
  };
  
 -static int __cpuinit adjust_tjmax(struct cpuinfo_x86 *c, u32 id,
 -                                struct device *dev)
 +static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
  {
        /* The 100C is default for both mobile and non mobile CPUs */
  
@@@ -316,7 -317,20 +316,19 @@@
        return tjmax;
  }
  
 -static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
 -                             struct device *dev)
+ static bool cpu_has_tjmax(struct cpuinfo_x86 *c)
+ {
+       u8 model = c->x86_model;
+ 
+       return model > 0xe &&
+              model != 0x1c &&
+              model != 0x26 &&
+              model != 0x27 &&
+              model != 0x35 &&
+              model != 0x36;
+ }
+ 
 +static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
  {
        int err;
        u32 eax, edx;
@@@ -328,7 -342,7 +340,7 @@@
         */
        err = rdmsr_safe_on_cpu(id, MSR_IA32_TEMPERATURE_TARGET, &eax, &edx);
        if (err) {
-               if (c->x86_model > 0xe && c->x86_model != 0x1c)
+               if (cpu_has_tjmax(c))
                        dev_warn(dev, "Unable to read TjMax from CPU %u\n", id);
        } else {
                val = (eax >> 16) & 0xff;
@@@ -365,8 -379,8 +377,8 @@@ static int create_name_attr(struct plat
        return device_create_file(dev, &pdata->name_attr);
  }
  
 -static int __cpuinit create_core_attrs(struct temp_data *tdata,
 -                                     struct device *dev, int attr_no)
 +static int create_core_attrs(struct temp_data *tdata, struct device *dev,
 +                           int attr_no)
  {
        int err, i;
        static ssize_t (*const rd_ptr[TOTAL_ATTRS]) (struct device *dev,
@@@ -399,7 -413,7 +411,7 @@@ exit_free
  }
  
  
 -static int __cpuinit chk_ucode_version(unsigned int cpu)
 +static int chk_ucode_version(unsigned int cpu)
  {
        struct cpuinfo_x86 *c = &cpu_data(cpu);
  
@@@ -415,7 -429,7 +427,7 @@@
        return 0;
  }
  
 -static struct platform_device __cpuinit *coretemp_get_pdev(unsigned int cpu)
 +static struct platform_device *coretemp_get_pdev(unsigned int cpu)
  {
        u16 phys_proc_id = TO_PHYS_ID(cpu);
        struct pdev_entry *p;
@@@ -432,7 -446,8 +444,7 @@@
        return NULL;
  }
  
 -static struct temp_data __cpuinit *init_temp_data(unsigned int cpu,
 -                                                int pkg_flag)
 +static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag)
  {
        struct temp_data *tdata;
  
@@@ -450,8 -465,8 +462,8 @@@
        return tdata;
  }
  
 -static int __cpuinit create_core_data(struct platform_device *pdev,
 -                              unsigned int cpu, int pkg_flag)
 +static int create_core_data(struct platform_device *pdev, unsigned int cpu,
 +                          int pkg_flag)
  {
        struct temp_data *tdata;
        struct platform_data *pdata = platform_get_drvdata(pdev);
@@@ -521,7 -536,7 +533,7 @@@ exit_free
        return err;
  }
  
 -static void __cpuinit coretemp_add_core(unsigned int cpu, int pkg_flag)
 +static void coretemp_add_core(unsigned int cpu, int pkg_flag)
  {
        struct platform_device *pdev = coretemp_get_pdev(cpu);
        int err;
@@@ -604,7 -619,7 +616,7 @@@ static struct platform_driver coretemp_
        .remove = coretemp_remove,
  };
  
 -static int __cpuinit coretemp_device_add(unsigned int cpu)
 +static int coretemp_device_add(unsigned int cpu)
  {
        int err;
        struct platform_device *pdev;
@@@ -648,7 -663,7 +660,7 @@@ exit
        return err;
  }
  
 -static void __cpuinit coretemp_device_remove(unsigned int cpu)
 +static void coretemp_device_remove(unsigned int cpu)
  {
        struct pdev_entry *p, *n;
        u16 phys_proc_id = TO_PHYS_ID(cpu);
@@@ -664,7 -679,7 +676,7 @@@
        mutex_unlock(&pdev_list_mutex);
  }
  
 -static bool __cpuinit is_any_core_online(struct platform_data *pdata)
 +static bool is_any_core_online(struct platform_data *pdata)
  {
        int i;
  
@@@ -678,7 -693,7 +690,7 @@@
        return false;
  }
  
 -static void __cpuinit get_core_online(unsigned int cpu)
 +static void get_core_online(unsigned int cpu)
  {
        struct cpuinfo_x86 *c = &cpu_data(cpu);
        struct platform_device *pdev = coretemp_get_pdev(cpu);
@@@ -720,7 -735,7 +732,7 @@@
        coretemp_add_core(cpu, 0);
  }
  
 -static void __cpuinit put_core_offline(unsigned int cpu)
 +static void put_core_offline(unsigned int cpu)
  {
        int i, indx;
        struct platform_data *pdata;
@@@ -768,7 -783,7 +780,7 @@@
                coretemp_device_remove(cpu);
  }
  
 -static int __cpuinit coretemp_cpu_callback(struct notifier_block *nfb,
 +static int coretemp_cpu_callback(struct notifier_block *nfb,
                                 unsigned long action, void *hcpu)
  {
        unsigned int cpu = (unsigned long) hcpu;