mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
4ca5f468cc
hwmon was using an idr with a NULL pointer, so convert to an ida which then allows use of Rusty's ida_simple_get. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Tejun Heo <tj@kernel.org> Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: David Airlie <airlied@linux.ie> Cc: Thomas Hellstrom <thellstrom@vmware.com> Cc: Evgeniy Polyakov <zbr@ioremap.net> Cc: Darrick J. Wong <djwong@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
128 lines
3 KiB
C
128 lines
3 KiB
C
/*
|
|
hwmon.c - part of lm_sensors, Linux kernel modules for hardware monitoring
|
|
|
|
This file defines the sysfs class "hwmon", for use by sensors drivers.
|
|
|
|
Copyright (C) 2005 Mark M. Hoffman <mhoffman@lightlink.com>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; version 2 of the License.
|
|
*/
|
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/device.h>
|
|
#include <linux/err.h>
|
|
#include <linux/kdev_t.h>
|
|
#include <linux/idr.h>
|
|
#include <linux/hwmon.h>
|
|
#include <linux/gfp.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/pci.h>
|
|
|
|
#define HWMON_ID_PREFIX "hwmon"
|
|
#define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d"
|
|
|
|
static struct class *hwmon_class;
|
|
|
|
static DEFINE_IDA(hwmon_ida);
|
|
|
|
/**
|
|
* hwmon_device_register - register w/ hwmon
|
|
* @dev: the device to register
|
|
*
|
|
* hwmon_device_unregister() must be called when the device is no
|
|
* longer needed.
|
|
*
|
|
* Returns the pointer to the new device.
|
|
*/
|
|
struct device *hwmon_device_register(struct device *dev)
|
|
{
|
|
struct device *hwdev;
|
|
int id;
|
|
|
|
id = ida_simple_get(&hwmon_ida, 0, 0, GFP_KERNEL);
|
|
if (id < 0)
|
|
return ERR_PTR(id);
|
|
|
|
hwdev = device_create(hwmon_class, dev, MKDEV(0, 0), NULL,
|
|
HWMON_ID_FORMAT, id);
|
|
|
|
if (IS_ERR(hwdev))
|
|
ida_simple_remove(&hwmon_ida, id);
|
|
|
|
return hwdev;
|
|
}
|
|
|
|
/**
|
|
* hwmon_device_unregister - removes the previously registered class device
|
|
*
|
|
* @dev: the class device to destroy
|
|
*/
|
|
void hwmon_device_unregister(struct device *dev)
|
|
{
|
|
int id;
|
|
|
|
if (likely(sscanf(dev_name(dev), HWMON_ID_FORMAT, &id) == 1)) {
|
|
device_unregister(dev);
|
|
ida_simple_remove(&hwmon_ida, id);
|
|
} else
|
|
dev_dbg(dev->parent,
|
|
"hwmon_device_unregister() failed: bad class ID!\n");
|
|
}
|
|
|
|
static void __init hwmon_pci_quirks(void)
|
|
{
|
|
#if defined CONFIG_X86 && defined CONFIG_PCI
|
|
struct pci_dev *sb;
|
|
u16 base;
|
|
u8 enable;
|
|
|
|
/* Open access to 0x295-0x296 on MSI MS-7031 */
|
|
sb = pci_get_device(PCI_VENDOR_ID_ATI, 0x436c, NULL);
|
|
if (sb &&
|
|
(sb->subsystem_vendor == 0x1462 && /* MSI */
|
|
sb->subsystem_device == 0x0031)) { /* MS-7031 */
|
|
|
|
pci_read_config_byte(sb, 0x48, &enable);
|
|
pci_read_config_word(sb, 0x64, &base);
|
|
|
|
if (base == 0 && !(enable & BIT(2))) {
|
|
dev_info(&sb->dev,
|
|
"Opening wide generic port at 0x295\n");
|
|
pci_write_config_word(sb, 0x64, 0x295);
|
|
pci_write_config_byte(sb, 0x48, enable | BIT(2));
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
static int __init hwmon_init(void)
|
|
{
|
|
hwmon_pci_quirks();
|
|
|
|
hwmon_class = class_create(THIS_MODULE, "hwmon");
|
|
if (IS_ERR(hwmon_class)) {
|
|
pr_err("couldn't create sysfs class\n");
|
|
return PTR_ERR(hwmon_class);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static void __exit hwmon_exit(void)
|
|
{
|
|
class_destroy(hwmon_class);
|
|
}
|
|
|
|
subsys_initcall(hwmon_init);
|
|
module_exit(hwmon_exit);
|
|
|
|
EXPORT_SYMBOL_GPL(hwmon_device_register);
|
|
EXPORT_SYMBOL_GPL(hwmon_device_unregister);
|
|
|
|
MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
|
|
MODULE_DESCRIPTION("hardware monitoring sysfs/class support");
|
|
MODULE_LICENSE("GPL");
|
|
|