Merge tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core and debugfs updates from Greg KH: "Here is the "big" driver core and debugfs changes for 5.3-rc1 It's a lot of different patches, all across the tree due to some api changes and lots of debugfs cleanups. Other than the debugfs cleanups, in this set of changes we have: - bus iteration function cleanups - scripts/get_abi.pl tool to display and parse Documentation/ABI entries in a simple way - cleanups to Documenatation/ABI/ entries to make them parse easier due to typos and other minor things - default_attrs use for some ktype users - driver model documentation file conversions to .rst - compressed firmware file loading - deferred probe fixes All of these have been in linux-next for a while, with a bunch of merge issues that Stephen has been patient with me for" * tag 'driver-core-5.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (102 commits) debugfs: make error message a bit more verbose orangefs: fix build warning from debugfs cleanup patch ubifs: fix build warning after debugfs cleanup patch driver: core: Allow subsystems to continue deferring probe drivers: base: cacheinfo: Ensure cpu hotplug work is done before Intel RDT arch_topology: Remove error messages on out-of-memory conditions lib: notifier-error-inject: no need to check return value of debugfs_create functions swiotlb: no need to check return value of debugfs_create functions ceph: no need to check return value of debugfs_create functions sunrpc: no need to check return value of debugfs_create functions ubifs: no need to check return value of debugfs_create functions orangefs: no need to check return value of debugfs_create functions nfsd: no need to check return value of debugfs_create functions lib: 842: no need to check return value of debugfs_create functions debugfs: provide pr_fmt() macro debugfs: log errors when something goes wrong drivers: s390/cio: Fix compilation warning about const qualifiers drivers: Add generic helper to match by of_node driver_find_device: Unify the match function with class_find_device() bus_find_device: Unify the match callback with class_find_device ...
This commit is contained in:
@@ -104,24 +104,12 @@ DEFINE_SHOW_ATTRIBUTE(punit_dev_state);
|
||||
|
||||
static struct dentry *punit_dbg_file;
|
||||
|
||||
static int punit_dbgfs_register(struct punit_device *punit_device)
|
||||
static void punit_dbgfs_register(struct punit_device *punit_device)
|
||||
{
|
||||
struct dentry *dev_state;
|
||||
|
||||
punit_dbg_file = debugfs_create_dir("punit_atom", NULL);
|
||||
if (!punit_dbg_file)
|
||||
return -ENXIO;
|
||||
|
||||
dev_state = debugfs_create_file("dev_power_state", 0444,
|
||||
punit_dbg_file, punit_device,
|
||||
&punit_dev_state_fops);
|
||||
if (!dev_state) {
|
||||
pr_err("punit_dev_state register failed\n");
|
||||
debugfs_remove(punit_dbg_file);
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
return 0;
|
||||
debugfs_create_file("dev_power_state", 0444, punit_dbg_file,
|
||||
punit_device, &punit_dev_state_fops);
|
||||
}
|
||||
|
||||
static void punit_dbgfs_unregister(void)
|
||||
@@ -145,15 +133,12 @@ MODULE_DEVICE_TABLE(x86cpu, intel_punit_cpu_ids);
|
||||
static int __init punit_atom_debug_init(void)
|
||||
{
|
||||
const struct x86_cpu_id *id;
|
||||
int ret;
|
||||
|
||||
id = x86_match_cpu(intel_punit_cpu_ids);
|
||||
if (!id)
|
||||
return -ENODEV;
|
||||
|
||||
ret = punit_dbgfs_register((struct punit_device *)id->driver_data);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
punit_dbgfs_register((struct punit_device *)id->driver_data);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user