lib and tuning cleanup series

From: Joe Konno <joe.konno(a)intel.com>

Pull the libpci initialization bits out and into its own dedicated function.

Signed-off-by Joe Konno <joe.konno(a)intel.com>

---
 src/lib.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

src/lib.cpp +9 -4

index 5e48f375d087..2b95e64f427b 100644
@@ -296,16 +296,21 @@ void format_watts(double W, char *buffer, unsigned int len)
 #ifndef HAVE_NO_PCI
 static struct pci_access *pci_access;
 
+static void check_pci_access(void)
+{
+	if (!pci_access) {
+		pci_access = pci_alloc();
+		pci_init(pci_access);
+	}
+}
+
 char *pci_id_to_name(uint16_t vendor, uint16_t device, char *buffer, int len)
 {
 	char *ret;
 
 	buffer[0] = 0;
 
-	if (!pci_access) {
-		pci_access = pci_alloc();
-		pci_init(pci_access);
-	}
+	check_pci_access();
 
 	ret = pci_lookup_name(pci_access, buffer, len, PCI_LOOKUP_VENDOR | PCI_LOOKUP_DEVICE, vendor, device);
 

Signature · 6 lines

2.13.5

_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop

From: Joe Konno <joe.konno(a)intel.com>

Signed-off-by Joe Konno <joe.konno(a)intel.com>

From: Joe Konno <joe.konno(a)intel.com>

After implementing the tunable_state enum, compiler warning showed switch statement within tunable result code was incomplete. Put another way, not all possible enum values were checked for. Fix the code so the compiler warning goes away.

Signed-off-by Joe Konno <joe.konno(a)intel.com>

---
 src/tuning/tunable.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

src/tuning/tunable.h +9 -3

index 5ea7cdfb5389..afb789d6f4a7 100644
@@ -59,14 +59,20 @@ public:
 
 	virtual char *result_string(void)
 	{
+		char *result = NULL;
+
 		switch (good_bad()) {
 		case TUNE_GOOD:
-			return good_string;
+			result = good_string;
 		case TUNE_BAD:
 		case TUNE_UNFIXABLE:
-			return bad_string;
+			result = bad_string;
+		case TUNE_NEUTRAL:
+		case TUNE_UNKNOWN:
+			result = neutral_string;
 		}
-		return neutral_string;
+
+		return result;
 	}
 
 

Signature · 6 lines

2.13.5

_______________________________________________
PowerTop mailing list
PowerTop(a)lists.01.org
https://lists.01.org/mailman/listinfo/powertop

From: Joe Konno <joe.konno(a)intel.com>

This series could be split in two, one for the libpci stuff in "lib", and another for "tuning" cleanups. The cleanups in "lib" are not dependent on the cleanups in "tuning" and vice-versa. There should be no changes to PowerTOP operations or usage as a result of these patches-- code cleanups only.

I was re-learning libpci a while back and, during my walks along various PCI buses, spotted a trivial refactor for the libpci functionality in "lib". This is to make it (slightly) more tempting to embark on future changes to walk PCI buses with libpci instead of sysfs-- especially in "tuning" cases.

While looking into additional runtime PM tunables, I stumbled upon #defines used for tunable states. Implemented those states in an enum instead. Proved easy as those defines were not used as factors in math operations, so they were acting as enum entries to begin with. After the enum was implemented, gcc warned about unhandled states in tunable::result_string()'s switch statement, so I fixed it.

Joe Konno (4):
lib: refactor pci_access checks
lib: have check_pci_access() scan the entire bus
tuning: use tunable_state enum instead of defines
tuning: complete tunable result switch

 src/lib.cpp                | 14 ++++++++++----
 src/tuning/bluetooth.cpp   |  6 +++---
 src/tuning/bluetooth.h     |  2 +-
 src/tuning/ethernet.cpp    |  4 ++--
 src/tuning/ethernet.h      |  2 +-
 src/tuning/runtime.cpp     |  2 +-
 src/tuning/runtime.h       |  2 +-
 src/tuning/tunable.h       | 26 +++++++++++++++++---------
 src/tuning/tuningi2c.cpp   |  2 +-
 src/tuning/tuningi2c.h     |  2 +-
 src/tuning/tuningsysfs.cpp |  2 +-
 src/tuning/tuningsysfs.h   |  2 +-
 src/tuning/tuningusb.cpp   |  2 +-
 src/tuning/tuningusb.h     |  2 +-
 src/tuning/wifi.cpp        |  2 +-
 src/tuning/wifi.h          |  2 +-
 16 files changed, 44 insertions(+), 30 deletions(-)