Skip to content

Commit

Permalink
hwmon: Rename i8k driver to dell-smm-hwmon and move it to hwmon tree
Browse files Browse the repository at this point in the history
This commit moves i8k driver to hwmon tree under name dell-smm-hwmon which is
better name then abbreviation i8k. For backward compatibility is added macro
MODULE_ALIAS("i8k") so modprobe will load driver also old name i8k. CONFIG_I8K
compile option was not changed.

This commit also adds me as maintainer of this new dell-smm-hwmon driver and
remove Guenter Roeck from list who is implicit maintainer all hwmon drivers.

Signed-off-by: Pali Rohár <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
pali authored and gregkh committed May 24, 2015
1 parent db17006 commit a5afba1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 5 deletions.
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -3092,9 +3092,9 @@ S: Maintained
F: drivers/platform/x86/dell-smo8800.c

DELL LAPTOP SMM DRIVER
M: Guenter Roeck <[email protected]>
M: Pali Rohár <[email protected]>
S: Maintained
F: drivers/char/i8k.c
F: drivers/hwmon/dell-smm-hwmon.c
F: include/uapi/linux/i8k.h

DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
Expand Down
1 change: 0 additions & 1 deletion drivers/char/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ else
obj-$(CONFIG_NVRAM) += nvram.o
endif
obj-$(CONFIG_TOSHIBA) += toshiba.o
obj-$(CONFIG_I8K) += i8k.o
obj-$(CONFIG_DS1620) += ds1620.o
obj-$(CONFIG_HW_RANDOM) += hw_random/
obj-$(CONFIG_PPDEV) += ppdev.o
Expand Down
1 change: 1 addition & 0 deletions drivers/hwmon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ obj-$(CONFIG_SENSORS_W83L785TS) += w83l785ts.o
obj-$(CONFIG_SENSORS_W83L786NG) += w83l786ng.o
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
obj-$(CONFIG_I8K) += dell-smm-hwmon.o

obj-$(CONFIG_PMBUS) += pmbus/

Expand Down
6 changes: 4 additions & 2 deletions drivers/char/i8k.c → drivers/hwmon/dell-smm-hwmon.c
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
/*
* i8k.c -- Linux driver for accessing the SMM BIOS on Dell laptops.
* dell-smm-hwmon.c -- Linux driver for accessing the SMM BIOS on Dell laptops.
*
* Copyright (C) 2001 Massimo Dal Zotto <[email protected]>
*
* Hwmon integration:
* Copyright (C) 2011 Jean Delvare <[email protected]>
* Copyright (C) 2013, 2014 Guenter Roeck <[email protected]>
* Copyright (C) 2014 Pali Rohár <[email protected]>
* Copyright (C) 2014, 2015 Pali Rohár <[email protected]>
*
* 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
Expand Down Expand Up @@ -80,8 +80,10 @@ static uint i8k_fan_max = I8K_FAN_HIGH;
#define I8K_HWMON_HAVE_FAN2 (1 << 5)

MODULE_AUTHOR("Massimo Dal Zotto ([email protected])");
MODULE_AUTHOR("Pali Rohár <[email protected]>");
MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");
MODULE_LICENSE("GPL");
MODULE_ALIAS("i8k");

static bool force;
module_param(force, bool, 0);
Expand Down

0 comments on commit a5afba1

Please sign in to comment.