aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/hwmon/coretemp.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-11 16:13:55 -0500
commitcff2f741b8ee8a70b208830e330de053efd4fc45 (patch)
tree83367ed74d889e2c8179f1f8b5d6f6f73b857982 /drivers/hwmon/coretemp.c
parentb0885d01f9ab1274109c02942c881d598f939623 (diff)
parent92e9e6d1f9844b73a26215025a922e7d7aeae361 (diff)
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
Diffstat (limited to 'drivers/hwmon/coretemp.c')
-rw-r--r--drivers/hwmon/coretemp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index 24426a785ad5..d64923d63537 100644
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -356,7 +356,7 @@ static int __cpuinit get_tjmax(struct cpuinfo_x86 *c, u32 id,
356 return adjust_tjmax(c, id, dev); 356 return adjust_tjmax(c, id, dev);
357} 357}
358 358
359static int __devinit create_name_attr(struct platform_data *pdata, 359static int create_name_attr(struct platform_data *pdata,
360 struct device *dev) 360 struct device *dev)
361{ 361{
362 sysfs_attr_init(&pdata->name_attr.attr); 362 sysfs_attr_init(&pdata->name_attr.attr);
@@ -551,7 +551,7 @@ static void coretemp_remove_core(struct platform_data *pdata,
551 pdata->core_data[indx] = NULL; 551 pdata->core_data[indx] = NULL;
552} 552}
553 553
554static int __devinit coretemp_probe(struct platform_device *pdev) 554static int coretemp_probe(struct platform_device *pdev)
555{ 555{
556 struct platform_data *pdata; 556 struct platform_data *pdata;
557 int err; 557 int err;
@@ -584,7 +584,7 @@ exit_free:
584 return err; 584 return err;
585} 585}
586 586
587static int __devexit coretemp_remove(struct platform_device *pdev) 587static int coretemp_remove(struct platform_device *pdev)
588{ 588{
589 struct platform_data *pdata = platform_get_drvdata(pdev); 589 struct platform_data *pdata = platform_get_drvdata(pdev);
590 int i; 590 int i;
@@ -606,7 +606,7 @@ static struct platform_driver coretemp_driver = {
606 .name = DRVNAME, 606 .name = DRVNAME,
607 }, 607 },
608 .probe = coretemp_probe, 608 .probe = coretemp_probe,
609 .remove = __devexit_p(coretemp_remove), 609 .remove = coretemp_remove,
610}; 610};
611 611
612static int __cpuinit coretemp_device_add(unsigned int cpu) 612static int __cpuinit coretemp_device_add(unsigned int cpu)