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

Commit eeeb98bf authored by Jakub Sitnicki's avatar Jakub Sitnicki Committed by Rafael J. Wysocki
Browse files

PNP: Switch from __check_region() to __request_region() 



PNP core is the last user of the __check_region() which has been
deprecated for almost 12 years (since v2.5.54). Replace it with a combo
of __request_region() followed by __release_region().

pnp_check_port() and pnp_check_mem() remain racy after this change.

Signed-off-by: default avatarJakub Sitnicki <jsitnicki@gmail.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent ec6f34e5

drivers/pnp/resource.c

+4 −2
Original line number Diff line number Diff line
@@ -179,8 +179,9 @@ int pnp_check_port(struct pnp_dev *dev, struct resource *res) 
	/* check if the resource is already in use, skip if the

	 * device is active because it itself may be in use */

	if (!dev->active) {

		if (__check_region(&ioport_resource, *port, length(port, end)))

		if (!request_region(*port, length(port, end), "pnp"))

			return 0;

		release_region(*port, length(port, end));

	}



	/* check if the resource is reserved */
@@ -241,8 +242,9 @@ int pnp_check_mem(struct pnp_dev *dev, struct resource *res) 
	/* check if the resource is already in use, skip if the

	 * device is active because it itself may be in use */

	if (!dev->active) {

		if (check_mem_region(*addr, length(addr, end)))

		if (!request_mem_region(*addr, length(addr, end), "pnp"))

			return 0;

		release_mem_region(*addr, length(addr, end));

	}



	/* check if the resource is reserved */