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 /include | |
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 'include')
-rw-r--r-- | include/linux/device.h | 4 | ||||
-rw-r--r-- | include/linux/power_supply.h | 2 | ||||
-rw-r--r-- | include/linux/rtc.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 251f33b21ef9..a089676084a5 100644 --- a/include/linux/device.h +++ b/include/linux/device.h | |||
@@ -395,8 +395,8 @@ extern int class_for_each_device(struct class *class, struct device *start, | |||
395 | void *data, | 395 | void *data, |
396 | int (*fn)(struct device *dev, void *data)); | 396 | int (*fn)(struct device *dev, void *data)); |
397 | extern struct device *class_find_device(struct class *class, | 397 | extern struct device *class_find_device(struct class *class, |
398 | struct device *start, void *data, | 398 | struct device *start, const void *data, |
399 | int (*match)(struct device *, void *)); | 399 | int (*match)(struct device *, const void *)); |
400 | 400 | ||
401 | struct class_attribute { | 401 | struct class_attribute { |
402 | struct attribute attr; | 402 | struct attribute attr; |
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h index 1f0ab90aff00..86ecaa679ded 100644 --- a/include/linux/power_supply.h +++ b/include/linux/power_supply.h | |||
@@ -224,7 +224,7 @@ struct power_supply_info { | |||
224 | int use_for_apm; | 224 | int use_for_apm; |
225 | }; | 225 | }; |
226 | 226 | ||
227 | extern struct power_supply *power_supply_get_by_name(char *name); | 227 | extern struct power_supply *power_supply_get_by_name(const char *name); |
228 | extern void power_supply_changed(struct power_supply *psy); | 228 | extern void power_supply_changed(struct power_supply *psy); |
229 | extern int power_supply_am_i_supplied(struct power_supply *psy); | 229 | extern int power_supply_am_i_supplied(struct power_supply *psy); |
230 | extern int power_supply_set_battery_charged(struct power_supply *psy); | 230 | extern int power_supply_set_battery_charged(struct power_supply *psy); |
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 9531845c419f..445fe6e7c629 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
@@ -148,7 +148,7 @@ extern int rtc_initialize_alarm(struct rtc_device *rtc, | |||
148 | extern void rtc_update_irq(struct rtc_device *rtc, | 148 | extern void rtc_update_irq(struct rtc_device *rtc, |
149 | unsigned long num, unsigned long events); | 149 | unsigned long num, unsigned long events); |
150 | 150 | ||
151 | extern struct rtc_device *rtc_class_open(char *name); | 151 | extern struct rtc_device *rtc_class_open(const char *name); |
152 | extern void rtc_class_close(struct rtc_device *rtc); | 152 | extern void rtc_class_close(struct rtc_device *rtc); |
153 | 153 | ||
154 | extern int rtc_irq_register(struct rtc_device *rtc, | 154 | extern int rtc_irq_register(struct rtc_device *rtc, |