Commit 0372fd1a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regmap-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap 

Pull regmap updates from Mark Brown:
 "Only two changes for this release, one fix for error handling with
  runtime PM and a change from Greg removing error handling from debugfs
  API calls now that they implement user visible error reporting"

* tag 'regmap-v5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap-irq: Correct error paths in regmap_irq_thread for pm_runtime
  regmap: no need to check return value of debugfs_create functions
parents 6729fb66 1bd45846

drivers/base/regmap/regmap-debugfs.c

+0 −12
Original line number Diff line number Diff line
@@ -588,14 +588,6 @@ void regmap_debugfs_init(struct regmap *map, const char *name) 
	}



	map->debugfs = debugfs_create_dir(name, regmap_debugfs_root);

	if (!map->debugfs) {

		dev_warn(map->dev,

			 "Failed to create %s debugfs directory\n", name);



		kfree(map->debugfs_name);

		map->debugfs_name = NULL;

		return;

	}



	debugfs_create_file("name", 0400, map->debugfs,

			    map, &regmap_name_fops);
@@ -672,10 +664,6 @@ void regmap_debugfs_initcall(void) 
	struct regmap_debugfs_node *node, *tmp;



	regmap_debugfs_root = debugfs_create_dir("regmap", NULL);

	if (!regmap_debugfs_root) {

		pr_warn("regmap: Failed to create debugfs root\n");

		return;

	}



	mutex_lock(&regmap_debugfs_early_lock);

	list_for_each_entry_safe(node, tmp, &regmap_debugfs_early_list, link) {

drivers/base/regmap/regmap-irq.c

+1 −6
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
		if (ret < 0) {

			dev_err(map->dev, "IRQ thread failed to resume: %d\n",

				ret);

			pm_runtime_put(map->dev);

			goto exit;

		}

	}
@@ -425,8 +424,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
					dev_err(map->dev,

						"Failed to read IRQ status %d\n",

						ret);

					if (chip->runtime_pm)

						pm_runtime_put(map->dev);

					goto exit;

				}

			}
@@ -478,8 +475,6 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
				dev_err(map->dev,

					"Failed to read IRQ status: %d\n",

					ret);

				if (chip->runtime_pm)

					pm_runtime_put(map->dev);

				goto exit;

			}

		}
@@ -513,10 +508,10 @@ static irqreturn_t regmap_irq_thread(int irq, void *d) 
		}

	}



exit:

	if (chip->runtime_pm)

		pm_runtime_put(map->dev);



exit:

	if (chip->handle_post_irq)

		chip->handle_post_irq(chip->irq_drv_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE