Commit d8831d55 authored by Stefan Richter's avatar Stefan Richter Committed by Ben Collins
Browse files

[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: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: default avatarBen Collins <bcollins@ubuntu.com>
parent d83e7d8e

drivers/ieee1394/csr.h

+5 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/ieee1394/hosts.h

+0 −7
Original line number Diff line number Diff line
@@ -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.