Commit 1550a17a authored by Dan Williams's avatar Dan Williams
Browse files

ACPI: NFIT: Drop nfit_device_lock() 



The nfit_device_lock() helper was added to provide lockdep coverage for
the NFIT driver's usage of device_lock() on the nvdimm_bus object. Now
that nvdimm_bus objects have their own lock class this wrapper can be
dropped.

Cc: Vishal Verma <vishal.l.verma@intel.com>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Link: https://lore.kernel.org/r/165055521409.3745911.8085645201146909612.stgit@dwillia2-desk3.amr.corp.intel.com


Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 4a0079bc

drivers/acpi/nfit/core.c

+15 −15
Original line number Diff line number Diff line
@@ -1230,7 +1230,7 @@ static ssize_t hw_error_scrub_store(struct device *dev, 
	if (rc)

		return rc;



	nfit_device_lock(dev);

	device_lock(dev);

	nd_desc = dev_get_drvdata(dev);

	if (nd_desc) {

		struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
@@ -1247,7 +1247,7 @@ static ssize_t hw_error_scrub_store(struct device *dev, 
			break;

		}

	}

	nfit_device_unlock(dev);

	device_unlock(dev);

	if (rc)

		return rc;

	return size;
@@ -1267,10 +1267,10 @@ static ssize_t scrub_show(struct device *dev, 
	ssize_t rc = -ENXIO;

	bool busy;



	nfit_device_lock(dev);

	device_lock(dev);

	nd_desc = dev_get_drvdata(dev);

	if (!nd_desc) {

		nfit_device_unlock(dev);

		device_unlock(dev);

		return rc;

	}

	acpi_desc = to_acpi_desc(nd_desc);
@@ -1287,7 +1287,7 @@ static ssize_t scrub_show(struct device *dev, 
	}



	mutex_unlock(&acpi_desc->init_mutex);

	nfit_device_unlock(dev);

	device_unlock(dev);

	return rc;

}
@@ -1304,14 +1304,14 @@ static ssize_t scrub_store(struct device *dev, 
	if (val != 1)

		return -EINVAL;



	nfit_device_lock(dev);

	device_lock(dev);

	nd_desc = dev_get_drvdata(dev);

	if (nd_desc) {

		struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);



		rc = acpi_nfit_ars_rescan(acpi_desc, ARS_REQ_LONG);

	}

	nfit_device_unlock(dev);

	device_unlock(dev);

	if (rc)

		return rc;

	return size;
@@ -1697,9 +1697,9 @@ static void acpi_nvdimm_notify(acpi_handle handle, u32 event, void *data) 
	struct acpi_device *adev = data;

	struct device *dev = &adev->dev;



	nfit_device_lock(dev->parent);

	device_lock(dev->parent);

	__acpi_nvdimm_notify(dev, event);

	nfit_device_unlock(dev->parent);

	device_unlock(dev->parent);

}



static bool acpi_nvdimm_has_method(struct acpi_device *adev, char *method)
@@ -3152,8 +3152,8 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc) 
	struct device *dev = acpi_desc->dev;



	/* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */

	nfit_device_lock(dev);

	nfit_device_unlock(dev);

	device_lock(dev);

	device_unlock(dev);



	/* Bounce the init_mutex to complete initial registration */

	mutex_lock(&acpi_desc->init_mutex);
@@ -3305,8 +3305,8 @@ void acpi_nfit_shutdown(void *data) 
	 * acpi_nfit_ars_rescan() submissions have had a chance to

	 * either submit or see ->cancel set.

	 */

	nfit_device_lock(bus_dev);

	nfit_device_unlock(bus_dev);

	device_lock(bus_dev);

	device_unlock(bus_dev);



	flush_workqueue(nfit_wq);

}
@@ -3449,9 +3449,9 @@ EXPORT_SYMBOL_GPL(__acpi_nfit_notify); 


static void acpi_nfit_notify(struct acpi_device *adev, u32 event)

{

	nfit_device_lock(&adev->dev);

	device_lock(&adev->dev);

	__acpi_nfit_notify(&adev->dev, adev->handle, event);

	nfit_device_unlock(&adev->dev);

	device_unlock(&adev->dev);

}



static const struct acpi_device_id acpi_nfit_ids[] = {

drivers/acpi/nfit/nfit.h

+0 −24
Original line number Diff line number Diff line
@@ -337,30 +337,6 @@ static inline struct acpi_nfit_desc *to_acpi_desc( 
	return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);

}



#ifdef CONFIG_PROVE_LOCKING

static inline void nfit_device_lock(struct device *dev)

{

	device_lock(dev);

	mutex_lock(&dev->lockdep_mutex);

}



static inline void nfit_device_unlock(struct device *dev)

{

	mutex_unlock(&dev->lockdep_mutex);

	device_unlock(dev);

}

#else

static inline void nfit_device_lock(struct device *dev)

{

	device_lock(dev);

}



static inline void nfit_device_unlock(struct device *dev)

{

	device_unlock(dev);

}

#endif



const guid_t *to_nfit_uuid(enum nfit_uuids id);

int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *nfit, acpi_size sz);

void acpi_nfit_shutdown(void *data);