Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5afba16 authored by Pali Rohár's avatar Pali Rohár Committed by Greg Kroah-Hartman
Browse files

hwmon: Rename i8k driver to dell-smm-hwmon and move it to hwmon tree 



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: default avatarPali Rohár <pali.rohar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent db170068

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -3092,9 +3092,9 @@ S: Maintained 
F:	drivers/platform/x86/dell-smo8800.c



DELL LAPTOP SMM DRIVER

M:	Guenter Roeck <linux@roeck-us.net>

M:	Pali Rohár <pali.rohar@gmail.com>

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)

drivers/char/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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/

drivers/char/i8k.c→drivers/hwmon/dell-smm-hwmon.c

+4 −2
Original line number Diff line number Diff line 
/*

 * 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 <dz@debian.org>

 *

 * Hwmon integration:

 * Copyright (C) 2011  Jean Delvare <jdelvare@suse.de>

 * Copyright (C) 2013, 2014  Guenter Roeck <linux@roeck-us.net>

 * Copyright (C) 2014  Pali Rohár <pali.rohar@gmail.com>

 * Copyright (C) 2014, 2015  Pali Rohár <pali.rohar@gmail.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
@@ -80,8 +80,10 @@ static uint i8k_fan_max = I8K_FAN_HIGH; 
#define I8K_HWMON_HAVE_FAN2	(1 << 5)



MODULE_AUTHOR("Massimo Dal Zotto (dz@debian.org)");

MODULE_AUTHOR("Pali Rohár <pali.rohar@gmail.com>");

MODULE_DESCRIPTION("Driver for accessing SMM BIOS on Dell laptops");

MODULE_LICENSE("GPL");

MODULE_ALIAS("i8k");



static bool force;

module_param(force, bool, 0);