Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e2b9d85 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-domains', 'pm-docs' and 'pm-devfreq' 

* pm-domains:
  PM / domains: Fix 'may be used uninitialized' build warning

* pm-docs:
  PM / docs: Drop confusing kernel-doc references from infrastructure.rst

* pm-devfreq:
  PM / devfreq: exynos-bus: Fix the wrong return value
  PM / devfreq: Fix the bug of devfreq_add_device when governor is NULL
  MAINTAINERS: Add myself as reviewer for DEVFREQ subsystem support
parents 3baad655 ab51e6ba 6e092c8c 32dd7731

Documentation/driver-api/infrastructure.rst

+0 −15
Original line number Diff line number Diff line
@@ -55,21 +55,6 @@ Device Drivers DMA Management 
.. kernel-doc:: drivers/base/dma-mapping.c

   :export:



Device Drivers Power Management

-------------------------------



.. kernel-doc:: drivers/base/power/main.c

   :export:



Device Drivers ACPI Support

---------------------------



.. kernel-doc:: drivers/acpi/scan.c

   :export:



.. kernel-doc:: drivers/acpi/scan.c

   :internal:



Device drivers PnP support

--------------------------

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -3800,6 +3800,7 @@ F: include/linux/devcoredump.h 
DEVICE FREQUENCY (DEVFREQ)

M:	MyungJoo Ham <myungjoo.ham@samsung.com>

M:	Kyungmin Park <kyungmin.park@samsung.com>

R:	Chanwoo Choi <cw00.choi@samsung.com>

L:	linux-pm@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git

S:	Maintained

drivers/base/power/domain.c

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ static int genpd_runtime_resume(struct device *dev) 


 out:

	/* Measure resume latency. */

	time_start = 0;

	if (timed && runtime_pm)

		time_start = ktime_get();

drivers/devfreq/devfreq.c

+10 −5
Original line number Diff line number Diff line
@@ -593,11 +593,16 @@ struct devfreq *devfreq_add_device(struct device *dev, 
	list_add(&devfreq->node, &devfreq_list);



	governor = find_devfreq_governor(devfreq->governor_name);

	if (!IS_ERR(governor))

	if (IS_ERR(governor)) {

		dev_err(dev, "%s: Unable to find governor for the device\n",

			__func__);

		err = PTR_ERR(governor);

		goto err_init;

	}



	devfreq->governor = governor;

	if (devfreq->governor)

		err = devfreq->governor->event_handler(devfreq,

					DEVFREQ_GOV_START, NULL);

	err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START,

						NULL);

	if (err) {

		dev_err(dev, "%s: Unable to start governor for the device\n",

			__func__);

drivers/devfreq/exynos-bus.c

+1 −1
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static int exynos_bus_probe(struct platform_device *pdev) 
	if (IS_ERR(bus->devfreq)) {

		dev_err(dev,

			"failed to add devfreq dev with passive governor\n");

		ret = -EPROBE_DEFER;

		ret = PTR_ERR(bus->devfreq);

		goto err;

	}