staging: gasket: cleanups du jour
v2 cover staging: gasket: cleanups du jour
From: Todd Poynor <[email protected]>
More cleanups for the gasket+apex drivers.
Patched changed in v2 from v1:
staging: gasket: core: print driver version code at registration time
staging: gasket: core: move driver loaded log after error cases
Above 2 patches replaced by new patch:
staging: gasket: core: remove registration logs
staging: gasket: core: device register debug log cleanups
Drop explicit "gasket:" prefix, use pr_fmt instead (in following patch)
staging: gasket: core: add subsystem and device info to error logs
Renamed: staging: gasket: core: add subsystem and device info to logs Use pr_fmt for modname prefix on logs
Revert "staging: gasket: core: hold reference to pci_dev while used"
Fixup SHA format in commit text.
Patches dropped from v2, already merged from v1:
staging: gasket: apex: enable power save mode by default
staging: gasket: remove "reset type" param from framework
staging: gasket: apex: drop reset type param
Todd Poynor (4):
staging: gasket: core: remove registration logs
staging: gasket: core: device register debug log cleanups
staging: gasket: core: add subsystem and device info to logs Revert "staging: gasket: core: hold reference to pci_dev while used"
drivers/staging/gasket/gasket_core.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-)
Signature · 1 line
2.18.0.597.ga71716f1ad-goog
PATCH v2 1/4 staging: gasket: core: remove registration logs
From: Todd Poynor <[email protected]>
Remove logs for loading gasket drivers.
--- drivers/staging/gasket/gasket_core.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/gasket/gasket_core.c +0 -4
@@ -1758,9 +1758,6 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc) }mutex_unlock (&g_mutex); -pr_info ("Loaded %s driver, framework version %s\n" , - driver_desc->name,GASKET_FRAMEWORK_VERSION ); -if (desc_idx ==-1 ) {pr_err ("Too many Gasket drivers loaded: %d\n" ,GASKET_FRAMEWORK_DESC_MAX );
@@ -1808,7 +1805,6 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc) goto fail2; } -pr_info ("Driver registered successfully.\n" );return 0 ; fail2:
Signature · 1 line
2.18.0.597.ga71716f1ad-goog
PATCH v2 2/4 staging: gasket: core: device register debug log cleanups
In reply to Todd PoynorFrom: Todd Poynor <[email protected]>
At device/driver registration time, convert a not-very-informative info message to a more informative debug message, drop some not overly helpful debug messages.
--- drivers/staging/gasket/gasket_core.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
drivers/staging/gasket/gasket_core.c +2 -5
@@ -1735,7 +1735,8 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)int desc_idx =-1 ;struct gasket_internal_desc *internal; -pr_info ("Initializing Gasket framework device\n" ); +pr_debug ("Loading %s driver version %s\n" , driver_desc->name, + driver_desc->driver_version);/* Check for duplicates and find a free slot. */ mutex_lock (&g_mutex);
@@ -1764,8 +1765,6 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)return -EBUSY ; } -/* Internal structure setup. */ -pr_debug ("Performing initial internal structure setup.\n" ); internal = &g_descs[desc_idx];mutex_init (&internal->mutex);memset (internal->devs,0 ,sizeof (struct gasket_dev *) *GASKET_DEV_MAX );
@@ -1788,7 +1787,6 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)* Not using pci_register_driver() (without underscores), as it * depends on KBUILD_MODNAME, and this is a shared file. */ -pr_debug ("Registering PCI driver.\n" ); ret =__pci_register_driver (&internal->pci, driver_desc->module, driver_desc->name);if (ret) {
@@ -1796,7 +1794,6 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc) goto fail1; } -pr_debug ("Registering char driver.\n" ); ret =register_chrdev_region (MKDEV (driver_desc->major, driver_desc->minor),GASKET_DEV_MAX , driver_desc->name);
Signature · 1 line
2.18.0.597.ga71716f1ad-goog
PATCH v2 3/4 staging: gasket: core: add subsystem and device info to logs
In reply to Todd PoynorFrom: Todd Poynor <[email protected]>
Identify gasket as the subsystem printing various messages. Add the driver name to appropriate messages to indicate which driver has a problem.
--- drivers/staging/gasket/gasket_core.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/staging/gasket/gasket_core.c +9 -4
@@ -6,6 +6,9 @@* * Copyright (C) 2018 Google, Inc. */ + +#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt +#include "gasket_core.h" #include "gasket_interrupt.h"
@@ -208,7 +211,7 @@ static int gasket_alloc_dev(struct gasket_internal_desc *internal_desc, gasket_dev = *pdev =kzalloc (sizeof (*gasket_dev),GFP_KERNEL );if (!gasket_dev) { -pr_err ("no memory for device\n" ); +pr_err ("no memory for device %s\n" , kobj_name);return -ENOMEM ; } internal_desc->devs[dev_idx] = gasket_dev;
@@ -1760,7 +1763,7 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc)mutex_unlock (&g_mutex);if (desc_idx ==-1 ) { -pr_err ("Too many Gasket drivers loaded: %d\n" , +pr_err ("too many drivers loaded, max %d\n" ,GASKET_FRAMEWORK_DESC_MAX );return -EBUSY ; }
@@ -1790,7 +1793,8 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc) ret =__pci_register_driver (&internal->pci, driver_desc->module, driver_desc->name);if (ret) { -pr_err ("cannot register pci driver [ret=%d]\n" , ret); +pr_err ("cannot register %s pci driver [ret=%d]\n" , + driver_desc->name, ret); goto fail1; }
@@ -1798,7 +1802,8 @@ int gasket_register_device(const struct gasket_driver_desc *driver_desc) driver_desc->minor), GASKET_DEV_MAX, driver_desc->name);if (ret) { -pr_err ("cannot register char driver [ret=%d]\n" , ret); +pr_err ("cannot register %s char driver [ret=%d]\n" , + driver_desc->name, ret); goto fail2; }
Signature · 1 line
2.18.0.597.ga71716f1ad-goog
PATCH v2 4/4 Revert "staging: gasket: core: hold reference to pci_dev while used"
In reply to Todd PoynorFrom: Todd Poynor <[email protected]>
There's no need to take an additional reference on the pci_dev structure for the pointer copy saved in gasket data structures.
This reverts commit:8dd8a48b9a7d ("staging: gasket: core: hold reference to pci_dev while used")
--- drivers/staging/gasket/gasket_core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/gasket/gasket_core.c +1 -2
@@ -255,7 +255,6 @@ static void gasket_free_dev(struct gasket_dev *gasket_dev) internal_desc->devs[gasket_dev->dev_idx] =NULL ;mutex_unlock (&internal_desc->mutex);put_device (gasket_dev->dev); -pci_dev_put (gasket_dev->pci_dev);kfree (gasket_dev); }
@@ -1477,7 +1476,7 @@ static int gasket_pci_probe(struct pci_dev *pci_dev, ret =gasket_alloc_dev (internal_desc, parent, &gasket_dev, kobj_name);if (ret)return ret; - gasket_dev->pci_dev =pci_dev_get (pci_dev); + gasket_dev->pci_dev = pci_dev;if (IS_ERR_OR_NULL (gasket_dev->dev_info.device)) { pr_err("Cannot create %s device %s [ret = %ld]\n", driver_desc->name, gasket_dev->dev_info.name,
Signature · 1 line
2.18.0.597.ga71716f1ad-goog