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 ...
Esse commit está contido em:
@@ -296,8 +296,6 @@ struct flexrm_mbox {
|
||||
struct dma_pool *bd_pool;
|
||||
struct dma_pool *cmpl_pool;
|
||||
struct dentry *root;
|
||||
struct dentry *config;
|
||||
struct dentry *stats;
|
||||
struct mbox_controller controller;
|
||||
};
|
||||
|
||||
@@ -1603,7 +1601,6 @@ static int flexrm_mbox_probe(struct platform_device *pdev)
|
||||
1 << RING_CMPL_ALIGN_ORDER, 0);
|
||||
if (!mbox->cmpl_pool) {
|
||||
ret = -ENOMEM;
|
||||
goto fail_destroy_bd_pool;
|
||||
}
|
||||
|
||||
/* Allocate platform MSIs for each ring */
|
||||
@@ -1624,28 +1621,15 @@ static int flexrm_mbox_probe(struct platform_device *pdev)
|
||||
|
||||
/* Create debugfs root entry */
|
||||
mbox->root = debugfs_create_dir(dev_name(mbox->dev), NULL);
|
||||
if (IS_ERR_OR_NULL(mbox->root)) {
|
||||
ret = PTR_ERR_OR_ZERO(mbox->root);
|
||||
goto fail_free_msis;
|
||||
}
|
||||
|
||||
/* Create debugfs config entry */
|
||||
mbox->config = debugfs_create_devm_seqfile(mbox->dev,
|
||||
"config", mbox->root,
|
||||
flexrm_debugfs_conf_show);
|
||||
if (IS_ERR_OR_NULL(mbox->config)) {
|
||||
ret = PTR_ERR_OR_ZERO(mbox->config);
|
||||
goto fail_free_debugfs_root;
|
||||
}
|
||||
debugfs_create_devm_seqfile(mbox->dev, "config", mbox->root,
|
||||
flexrm_debugfs_conf_show);
|
||||
|
||||
/* Create debugfs stats entry */
|
||||
mbox->stats = debugfs_create_devm_seqfile(mbox->dev,
|
||||
"stats", mbox->root,
|
||||
flexrm_debugfs_stats_show);
|
||||
if (IS_ERR_OR_NULL(mbox->stats)) {
|
||||
ret = PTR_ERR_OR_ZERO(mbox->stats);
|
||||
goto fail_free_debugfs_root;
|
||||
}
|
||||
debugfs_create_devm_seqfile(mbox->dev, "stats", mbox->root,
|
||||
flexrm_debugfs_stats_show);
|
||||
|
||||
skip_debugfs:
|
||||
|
||||
/* Initialize mailbox controller */
|
||||
@@ -1676,11 +1660,9 @@ skip_debugfs:
|
||||
|
||||
fail_free_debugfs_root:
|
||||
debugfs_remove_recursive(mbox->root);
|
||||
fail_free_msis:
|
||||
platform_msi_domain_free_irqs(dev);
|
||||
fail_destroy_cmpl_pool:
|
||||
dma_pool_destroy(mbox->cmpl_pool);
|
||||
fail_destroy_bd_pool:
|
||||
dma_pool_destroy(mbox->bd_pool);
|
||||
fail:
|
||||
return ret;
|
||||
|
@@ -395,8 +395,6 @@ struct pdc_state {
|
||||
*/
|
||||
struct scatterlist *src_sg[PDC_RING_ENTRIES];
|
||||
|
||||
struct dentry *debugfs_stats; /* debug FS stats file for this PDC */
|
||||
|
||||
/* counters */
|
||||
u32 pdc_requests; /* number of request messages submitted */
|
||||
u32 pdc_replies; /* number of reply messages received */
|
||||
@@ -501,9 +499,8 @@ static void pdc_setup_debugfs(struct pdc_state *pdcs)
|
||||
debugfs_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
|
||||
|
||||
/* S_IRUSR == 0400 */
|
||||
pdcs->debugfs_stats = debugfs_create_file(spu_stats_name, 0400,
|
||||
debugfs_dir, pdcs,
|
||||
&pdc_debugfs_stats);
|
||||
debugfs_create_file(spu_stats_name, 0400, debugfs_dir, pdcs,
|
||||
&pdc_debugfs_stats);
|
||||
}
|
||||
|
||||
static void pdc_free_debugfs(void)
|
||||
@@ -1603,7 +1600,6 @@ static int pdc_probe(struct platform_device *pdev)
|
||||
if (err)
|
||||
goto cleanup_buf_pool;
|
||||
|
||||
pdcs->debugfs_stats = NULL;
|
||||
pdc_setup_debugfs(pdcs);
|
||||
|
||||
dev_dbg(dev, "pdc_probe() successful");
|
||||
|
Referência em uma nova issue
Block a user