driver-core: constify data for class_find_device()
All in-kernel users of class_find_device() don't really need mutable data for match callback. In two places (kernel/power/suspend_test.c, drivers/scsi/osd/osd_uld.c) this patch changes match callbacks to use const search data. The const is propagated to rtc_class_open() and power_supply_get_by_name() parameters. Note that there's a dev reference leak in suspend_test.c that's not touched in this patch. Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
807be03cae
commit
9f3b795a62
@@ -40,9 +40,9 @@
|
||||
|
||||
#include "uwb-internal.h"
|
||||
|
||||
static int uwb_rc_index_match(struct device *dev, void *data)
|
||||
static int uwb_rc_index_match(struct device *dev, const void *data)
|
||||
{
|
||||
int *index = data;
|
||||
const int *index = data;
|
||||
struct uwb_rc *rc = dev_get_drvdata(dev);
|
||||
|
||||
if (rc->index == *index)
|
||||
@@ -334,9 +334,9 @@ void uwb_rc_rm(struct uwb_rc *rc)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(uwb_rc_rm);
|
||||
|
||||
static int find_rc_try_get(struct device *dev, void *data)
|
||||
static int find_rc_try_get(struct device *dev, const void *data)
|
||||
{
|
||||
struct uwb_rc *target_rc = data;
|
||||
const struct uwb_rc *target_rc = data;
|
||||
struct uwb_rc *rc = dev_get_drvdata(dev);
|
||||
|
||||
if (rc == NULL) {
|
||||
@@ -386,9 +386,9 @@ static inline struct uwb_rc *uwb_rc_get(struct uwb_rc *rc)
|
||||
return rc;
|
||||
}
|
||||
|
||||
static int find_rc_grandpa(struct device *dev, void *data)
|
||||
static int find_rc_grandpa(struct device *dev, const void *data)
|
||||
{
|
||||
struct device *grandpa_dev = data;
|
||||
const struct device *grandpa_dev = data;
|
||||
struct uwb_rc *rc = dev_get_drvdata(dev);
|
||||
|
||||
if (rc->uwb_dev.dev.parent->parent == grandpa_dev) {
|
||||
@@ -419,7 +419,7 @@ struct uwb_rc *uwb_rc_get_by_grandpa(const struct device *grandpa_dev)
|
||||
struct device *dev;
|
||||
struct uwb_rc *rc = NULL;
|
||||
|
||||
dev = class_find_device(&uwb_rc_class, NULL, (void *)grandpa_dev,
|
||||
dev = class_find_device(&uwb_rc_class, NULL, grandpa_dev,
|
||||
find_rc_grandpa);
|
||||
if (dev)
|
||||
rc = dev_get_drvdata(dev);
|
||||
@@ -432,9 +432,9 @@ EXPORT_SYMBOL_GPL(uwb_rc_get_by_grandpa);
|
||||
*
|
||||
* @returns the pointer to the radio controller, properly referenced
|
||||
*/
|
||||
static int find_rc_dev(struct device *dev, void *data)
|
||||
static int find_rc_dev(struct device *dev, const void *data)
|
||||
{
|
||||
struct uwb_dev_addr *addr = data;
|
||||
const struct uwb_dev_addr *addr = data;
|
||||
struct uwb_rc *rc = dev_get_drvdata(dev);
|
||||
|
||||
if (rc == NULL) {
|
||||
@@ -453,8 +453,7 @@ struct uwb_rc *uwb_rc_get_by_dev(const struct uwb_dev_addr *addr)
|
||||
struct device *dev;
|
||||
struct uwb_rc *rc = NULL;
|
||||
|
||||
dev = class_find_device(&uwb_rc_class, NULL, (void *)addr,
|
||||
find_rc_dev);
|
||||
dev = class_find_device(&uwb_rc_class, NULL, addr, find_rc_dev);
|
||||
if (dev)
|
||||
rc = dev_get_drvdata(dev);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user