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

Commit 4495dfdd authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

drivers: Introduce device lookup variants by device type 



Add a helper to match a device by its type and provide wrappers
for {bus/class/driver}_find_device() APIs.

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Harald Freudenberger <freude@linux.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Tomas Winkler <tomas.winkler@intel.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20190723221838.12024-5-suzuki.poulose@arm.com


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

drivers/base/core.c

+7 −8
Original line number Diff line number Diff line
@@ -2867,13 +2867,6 @@ struct device *device_create_with_groups(struct class *class, 
}

EXPORT_SYMBOL_GPL(device_create_with_groups);



static int __match_devt(struct device *dev, const void *data)

{

	const dev_t *devt = data;



	return dev->devt == *devt;

}



/**

 * device_destroy - removes a device that was created with device_create()

 * @class: pointer to the struct class that this device was registered with
@@ -2886,7 +2879,7 @@ void device_destroy(struct class *class, dev_t devt) 
{

	struct device *dev;



	dev = class_find_device(class, NULL, &devt, __match_devt);

	dev = class_find_device_by_devt(class, devt);

	if (dev) {

		put_device(dev);

		device_unregister(dev);
@@ -3374,3 +3367,9 @@ int device_match_fwnode(struct device *dev, const void *fwnode) 
	return dev_fwnode(dev) == fwnode;

}

EXPORT_SYMBOL_GPL(device_match_fwnode);



int device_match_devt(struct device *dev, const void *pdevt)

{

	return dev->devt == *(dev_t *)pdevt;

}

EXPORT_SYMBOL_GPL(device_match_devt);

drivers/hwtracing/intel_th/core.c

+1 −9
Original line number Diff line number Diff line
@@ -789,12 +789,6 @@ static int intel_th_populate(struct intel_th *th) 
	return 0;

}



static int match_devt(struct device *dev, const void *data)

{

	dev_t devt = (dev_t)(unsigned long)(void *)data;

	return dev->devt == devt;

}



static int intel_th_output_open(struct inode *inode, struct file *file)

{

	const struct file_operations *fops;
@@ -802,9 +796,7 @@ static int intel_th_output_open(struct inode *inode, struct file *file) 
	struct device *dev;

	int err;



	dev = bus_find_device(&intel_th_bus, NULL,

			      (void *)(unsigned long)inode->i_rdev,

			      match_devt);

	dev = bus_find_device_by_devt(&intel_th_bus, inode->i_rdev);

	if (!dev || !dev->driver)

		return -ENODEV;

drivers/misc/mei/main.c

+1 −8
Original line number Diff line number Diff line
@@ -858,13 +858,6 @@ static ssize_t dev_state_show(struct device *device, 
}

static DEVICE_ATTR_RO(dev_state);



static int match_devt(struct device *dev, const void *data)

{

	const dev_t *devt = data;



	return dev->devt == *devt;

}



/**

 * dev_set_devstate: set to new device state and notify sysfs file.

 *
@@ -880,7 +873,7 @@ void mei_set_devstate(struct mei_device *dev, enum mei_dev_state state) 


	dev->dev_state = state;



	clsdev = class_find_device(mei_class, NULL, &dev->cdev.dev, match_devt);

	clsdev = class_find_device_by_devt(mei_class, dev->cdev.dev);

	if (clsdev) {

		sysfs_notify(&clsdev->kobj, NULL, "dev_state");

		put_device(clsdev);

drivers/s390/crypto/zcrypt_api.c

+1 −10
Original line number Diff line number Diff line
@@ -133,12 +133,6 @@ struct zcdn_device { 
static int zcdn_create(const char *name);

static int zcdn_destroy(const char *name);



/* helper function, matches the devt value for find_zcdndev_by_devt() */

static int __match_zcdn_devt(struct device *dev, const void *data)

{

	return dev->devt == *((dev_t *) data);

}



/*

 * Find zcdn device by name.

 * Returns reference to the zcdn device which needs to be released
@@ -158,10 +152,7 @@ static inline struct zcdn_device *find_zcdndev_by_name(const char *name) 
 */

static inline struct zcdn_device *find_zcdndev_by_devt(dev_t devt)

{

	struct device *dev =

		class_find_device(zcrypt_class, NULL,

				  (void *) &devt,

				  __match_zcdn_devt);

	struct device *dev = class_find_device_by_devt(zcrypt_class, devt);



	return dev ? to_zcdn_dev(dev) : NULL;

}

drivers/tty/tty_io.c

+1 −7
Original line number Diff line number Diff line
@@ -2952,17 +2952,11 @@ void do_SAK(struct tty_struct *tty) 


EXPORT_SYMBOL(do_SAK);



static int dev_match_devt(struct device *dev, const void *data)

{

	const dev_t *devt = data;

	return dev->devt == *devt;

}



/* Must put_device() after it's unused! */

static struct device *tty_get_device(struct tty_struct *tty)

{

	dev_t devt = tty_devnum(tty);

	return class_find_device(tty_class, NULL, &devt, dev_match_devt);

	return class_find_device_by_devt(tty_class, devt);

}