Commit 240bf4e6 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Greg Kroah-Hartman
Browse files

vdpa: Use helper for safer setting of driver_override 



Use a helper to set driver_override to the reduce amount of duplicated
code.

Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20220419113435.246203-9-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19368f0f

drivers/vdpa/vdpa.c

+4 −25
Original line number Diff line number Diff line
@@ -77,32 +77,11 @@ static ssize_t driver_override_store(struct device *dev, 
				     const char *buf, size_t count)

{

	struct vdpa_device *vdev = dev_to_vdpa(dev);

	const char *driver_override, *old;

	char *cp;

	int ret;



	/* We need to keep extra room for a newline */

	if (count >= (PAGE_SIZE - 1))

		return -EINVAL;



	driver_override = kstrndup(buf, count, GFP_KERNEL);

	if (!driver_override)

		return -ENOMEM;



	cp = strchr(driver_override, '\n');

	if (cp)

		*cp = '\0';



	device_lock(dev);

	old = vdev->driver_override;

	if (strlen(driver_override)) {

		vdev->driver_override = driver_override;

	} else {

		kfree(driver_override);

		vdev->driver_override = NULL;

	}

	device_unlock(dev);



	kfree(old);

	ret = driver_set_override(dev, &vdev->driver_override, buf, count);

	if (ret)

		return ret;



	return count;

}

include/linux/vdpa.h

+3 −1
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ struct vdpa_mgmt_dev; 
 * struct vdpa_device - representation of a vDPA device

 * @dev: underlying device

 * @dma_dev: the actual device that is performing DMA

 * @driver_override: driver name to force a match

 * @driver_override: driver name to force a match; do not set directly,

 *                   because core frees it; use driver_set_override() to

 *                   set or clear it.

 * @config: the configuration ops for this device.

 * @cf_mutex: Protects get and set access to configuration layout.

 * @index: device index