redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

hwmon: (occ) Move common code to a separate module 

Instead of duplicating the common code into the 2 (binary) drivers,
move the common code to a separate module. This is cleaner.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Eddie James <eajames@linux.ibm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Eddie James <eajames@linux.ibm.com>
Tested-by: Eddie James <eajames@linux.ibm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
hifive-unleashed-5.2
Jean Delvare 2019-04-10 12:47:26 +02:00 committed by Guenter Roeck
parent 14b97ba5c2
commit 5679ed9906
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/hwmon/occ/Kconfig
View File

@ -27,5 +27,4 @@ config SENSORS_OCC_P9_SBE
called occ-p9-hwmon.
config SENSORS_OCC
bool "POWER On-Chip Controller"
depends on SENSORS_OCC_P8_I2C || SENSORS_OCC_P9_SBE
tristate

6
drivers/hwmon/occ/Makefile
View File

@ -1,5 +1,7 @@
occ-p8-hwmon-objs := common.o sysfs.o p8_i2c.o
occ-p9-hwmon-objs := common.o sysfs.o p9_sbe.o
occ-hwmon-common-objs := common.o sysfs.o
occ-p8-hwmon-objs := p8_i2c.o
occ-p9-hwmon-objs := p9_sbe.o
obj-$(CONFIG_SENSORS_OCC) += occ-hwmon-common.o
obj-$(CONFIG_SENSORS_OCC_P8_I2C) += occ-p8-hwmon.o
obj-$(CONFIG_SENSORS_OCC_P9_SBE) += occ-p9-hwmon.o

7
drivers/hwmon/occ/common.c
View File

@ -2,11 +2,13 @@
// Copyright IBM Corp 2019
#include <linux/device.h>
#include <linux/export.h>
#include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/jiffies.h>
#include <linux/kernel.h>
#include <linux/math64.h>
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/sysfs.h>
#include <asm/unaligned.h>
@ -1099,3 +1101,8 @@ int occ_setup(struct occ *occ, const char *name)
return rc;
}
EXPORT_SYMBOL_GPL(occ_setup);
MODULE_AUTHOR("Eddie James <eajames@linux.ibm.com>");
MODULE_DESCRIPTION("Common OCC hwmon code");
MODULE_LICENSE("GPL");

2
drivers/hwmon/occ/sysfs.c
View File

@ -3,6 +3,7 @@
#include <linux/bitops.h>
#include <linux/device.h>
#include <linux/export.h>
#include <linux/hwmon-sysfs.h>
#include <linux/kernel.h>
#include <linux/sysfs.h>
@ -177,3 +178,4 @@ void occ_shutdown(struct occ *occ)
{
sysfs_remove_group(&occ->bus_dev->kobj, &occ_sysfs);
}
EXPORT_SYMBOL_GPL(occ_shutdown);