Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Stefan Richter and committed by
Ben Collins
d8831d55 d83e7d8e

+5 -7
+5
drivers/ieee1394/csr.h
··· 91 91 int init_csr(void); 92 92 void cleanup_csr(void); 93 93 94 + /* hpsb_update_config_rom() is deprecated */ 95 + struct hpsb_host; 96 + int hpsb_update_config_rom(struct hpsb_host *host, const quadlet_t *new_rom, 97 + size_t size, unsigned char rom_version); 98 + 94 99 #endif /* _IEEE1394_CSR_H */
-7
drivers/ieee1394/hosts.h
··· 205 205 int hpsb_add_host(struct hpsb_host *host); 206 206 void hpsb_remove_host(struct hpsb_host *h); 207 207 208 - /* The following 2 functions are deprecated and will be removed when the 209 - * raw1394/libraw1394 update is complete. */ 210 - int hpsb_update_config_rom(struct hpsb_host *host, 211 - const quadlet_t *new_rom, size_t size, unsigned char rom_version); 212 - int hpsb_get_config_rom(struct hpsb_host *host, quadlet_t *buffer, 213 - size_t buffersize, size_t *rom_size, unsigned char *rom_version); 214 - 215 208 /* Updates the configuration rom image of a host. rom_version must be the 216 209 * current version, otherwise it will fail with return value -1. If this 217 210 * host does not support config-rom-update, it will return -EINVAL.