diff options
author | Geoff Levand <geoffrey.levand@am.sony.com> | 2009-04-12 15:11:38 +0000 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2009-06-30 15:29:00 +0800 |
commit | 6fd6d956ae55e755e2116d86942c62767df033de (patch) | |
tree | ca85c2ac708443b1daadfa9dbb2ad1b6dfd5cc2b /ui | |
parent | e058e90117300125af7b6e93eb0e5aeb23543af9 (diff) | |
download | petitboot-6fd6d956ae55e755e2116d86942c62767df033de.zip petitboot-6fd6d956ae55e755e2116d86942c62767df033de.tar.gz |
Revert const device in discover_client_ops
Make the device structure passed to the discover_client_ops callbacks
writable.
Commit 2b42cdd35ccd83c52e9df257efdfcda040d170d9 (Make client ops constant)
changed the discover_client_ops callback routine arguments to be pointers
to const device structures. Typically, the callback routines will
initialize and destroy the device.ui_info and boot_option.info variables,
so the device instance must be writable by the callback routines.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'ui')
-rw-r--r-- | ui/common/discover-client.h | 4 | ||||
-rw-r--r-- | ui/test/pb-test.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ui/common/discover-client.h b/ui/common/discover-client.h index d2a8fc4..f9f74e5 100644 --- a/ui/common/discover-client.h +++ b/ui/common/discover-client.h @@ -13,8 +13,8 @@ struct discover_client; */ struct discover_client_ops { - int (*device_add)(const struct device *device, void *arg); - void (*device_remove)(const struct device *device, void *arg); + int (*device_add)(struct device *device, void *arg); + void (*device_remove)(struct device *device, void *arg); void *cb_arg; }; diff --git a/ui/test/pb-test.c b/ui/test/pb-test.c index 69f65fb..f3ef746 100644 --- a/ui/test/pb-test.c +++ b/ui/test/pb-test.c @@ -3,7 +3,7 @@ #include "ui/common/discover-client.h" -static int print_device_add(const struct device *device, +static int print_device_add(struct device *device, void __attribute__((unused)) *arg) { struct boot_option *opt; @@ -28,7 +28,7 @@ static int print_device_add(const struct device *device, return 0; } -static void print_device_remove(const struct device *device, +static void print_device_remove(struct device *device, void __attribute__((unused)) *arg) { printf("removed device:\n"); |