diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-07-03 18:02:31 +0200 |
|---|---|---|
| committer | Ben Collins <bcollins@ubuntu.com> | 2006-07-03 18:02:31 +0200 |
| commit | d8831d5554c2f295a6746e9d3b4cbd8bb13a540f (patch) | |
| tree | 55c407be6dba1f3be07be382085732a3df7257b6 /drivers/ieee1394 | |
| parent | [PATCH] ieee1394: remove unused macros HPSB_PANIC and HPSB_TRACE (diff) | |
| download | linux-d8831d5554c2f295a6746e9d3b4cbd8bb13a540f.tar.xz linux-d8831d5554c2f295a6746e9d3b4cbd8bb13a540f.zip | |
[PATCH] ieee1394: clean up declarations of hpsb_*_config_rom
hpsb_update_config_rom() is defined in csr.c, not hosts.c.
hpsb_get_config_rom() does not exist.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/csr.h | 5 | ||||
| -rw-r--r-- | drivers/ieee1394/hosts.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/ieee1394/csr.h b/drivers/ieee1394/csr.h index 2bc080f76510..f11546550d84 100644 --- a/drivers/ieee1394/csr.h +++ b/drivers/ieee1394/csr.h @@ -91,4 +91,9 @@ extern struct csr1212_bus_ops csr_bus_ops; int init_csr(void); void cleanup_csr(void); +/* hpsb_update_config_rom() is deprecated */ +struct hpsb_host; +int hpsb_update_config_rom(struct hpsb_host *host, const quadlet_t *new_rom, + size_t size, unsigned char rom_version); + #endif /* _IEEE1394_CSR_H */ diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index b911e2af99a3..69a7c9ff5ed7 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h @@ -205,13 +205,6 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, int hpsb_add_host(struct hpsb_host *host); void hpsb_remove_host(struct hpsb_host *h); -/* The following 2 functions are deprecated and will be removed when the - * raw1394/libraw1394 update is complete. */ -int hpsb_update_config_rom(struct hpsb_host *host, - const quadlet_t *new_rom, size_t size, unsigned char rom_version); -int hpsb_get_config_rom(struct hpsb_host *host, quadlet_t *buffer, - size_t buffersize, size_t *rom_size, unsigned char *rom_version); - /* Updates the configuration rom image of a host. rom_version must be the * current version, otherwise it will fail with return value -1. If this * host does not support config-rom-update, it will return -EINVAL. |