The patch titled
ieee1394: clean up declarations of hpsb_*_config_rom
has been removed from the -mm tree. Its filename is
ieee1394-clean-up-declarations-of-hpsb__config_rom.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ieee1394: clean up declarations of hpsb_*_config_rom
From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxxxxx>
Cc: Ben Collins <bcollins@xxxxxxxxxx>
Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ieee1394/csr.h | 5 +++++
drivers/ieee1394/hosts.h | 7 -------
2 files changed, 5 insertions(+), 7 deletions(-)
diff -puN drivers/ieee1394/csr.h~ieee1394-clean-up-declarations-of-hpsb__config_rom drivers/ieee1394/csr.h
--- a/drivers/ieee1394/csr.h~ieee1394-clean-up-declarations-of-hpsb__config_rom
+++ a/drivers/ieee1394/csr.h
@@ -91,4 +91,9 @@ extern struct csr1212_bus_ops csr_bus_op
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 -puN drivers/ieee1394/hosts.h~ieee1394-clean-up-declarations-of-hpsb__config_rom drivers/ieee1394/hosts.h
--- a/drivers/ieee1394/hosts.h~ieee1394-clean-up-declarations-of-hpsb__config_rom
+++ a/drivers/ieee1394/hosts.h
@@ -205,13 +205,6 @@ struct hpsb_host *hpsb_alloc_host(struct
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.
_
Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are
origin.patch
git-ieee1394.patch
ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch
ieee1394-shrink-tlabel-pools-remove-tpool-semaphores.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
