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

Commit 5679ed99 authored by Jean Delvare's avatar Jean Delvare Committed by Guenter Roeck
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Cc: Eddie James <eajames@linux.ibm.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarEddie James <eajames@linux.ibm.com>
Tested-by: default avatarEddie James <eajames@linux.ibm.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 14b97ba5

drivers/hwmon/occ/Kconfig

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

drivers/hwmon/occ/Makefile

+4 −2
Original line number Diff line number Diff line 
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

drivers/hwmon/occ/common.c

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

drivers/hwmon/occ/sysfs.c

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