diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2013-02-01 14:40:17 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-06 15:18:56 -0500 |
commit | 9f3b795a626ee79574595e06d1437fe0c7d51d29 (patch) | |
tree | 1952cb2ac880c0e66f291916815c2a36b4ceb300 /net | |
parent | 807be03cae191cb88e2f267adcd49aba785c658b (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ieee802154/wpan-class.c | 5 | ||||
-rw-r--r-- | net/nfc/core.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c index 1627ef2e8522..13571eae6bae 100644 --- a/net/ieee802154/wpan-class.c +++ b/net/ieee802154/wpan-class.c | |||
@@ -91,7 +91,7 @@ static struct class wpan_phy_class = { | |||
91 | static DEFINE_MUTEX(wpan_phy_mutex); | 91 | static DEFINE_MUTEX(wpan_phy_mutex); |
92 | static int wpan_phy_idx; | 92 | static int wpan_phy_idx; |
93 | 93 | ||
94 | static int wpan_phy_match(struct device *dev, void *data) | 94 | static int wpan_phy_match(struct device *dev, const void *data) |
95 | { | 95 | { |
96 | return !strcmp(dev_name(dev), (const char *)data); | 96 | return !strcmp(dev_name(dev), (const char *)data); |
97 | } | 97 | } |
@@ -103,8 +103,7 @@ struct wpan_phy *wpan_phy_find(const char *str) | |||
103 | if (WARN_ON(!str)) | 103 | if (WARN_ON(!str)) |
104 | return NULL; | 104 | return NULL; |
105 | 105 | ||
106 | dev = class_find_device(&wpan_phy_class, NULL, | 106 | dev = class_find_device(&wpan_phy_class, NULL, str, wpan_phy_match); |
107 | (void *)str, wpan_phy_match); | ||
108 | if (!dev) | 107 | if (!dev) |
109 | return NULL; | 108 | return NULL; |
110 | 109 | ||
diff --git a/net/nfc/core.c b/net/nfc/core.c index aa64ea441676..0f4a6de6f161 100644 --- a/net/nfc/core.c +++ b/net/nfc/core.c | |||
@@ -734,10 +734,10 @@ struct class nfc_class = { | |||
734 | }; | 734 | }; |
735 | EXPORT_SYMBOL(nfc_class); | 735 | EXPORT_SYMBOL(nfc_class); |
736 | 736 | ||
737 | static int match_idx(struct device *d, void *data) | 737 | static int match_idx(struct device *d, const void *data) |
738 | { | 738 | { |
739 | struct nfc_dev *dev = to_nfc_dev(d); | 739 | struct nfc_dev *dev = to_nfc_dev(d); |
740 | unsigned int *idx = data; | 740 | const unsigned int *idx = data; |
741 | 741 | ||
742 | return dev->idx == *idx; | 742 | return dev->idx == *idx; |
743 | } | 743 | } |