aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/ieee1394/highlevel.h9
-rw-r--r--drivers/ieee1394/nodemgr.c2
-rw-r--r--drivers/ieee1394/nodemgr.h4
3 files changed, 1 insertions, 14 deletions
diff --git a/drivers/ieee1394/highlevel.h b/drivers/ieee1394/highlevel.h
index 4b330117067a..55548368b190 100644
--- a/drivers/ieee1394/highlevel.h
+++ b/drivers/ieee1394/highlevel.h
@@ -176,11 +176,6 @@ void hpsb_destroy_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host);
176void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host, 176void hpsb_set_hostinfo_key(struct hpsb_highlevel *hl, struct hpsb_host *host,
177 unsigned long key); 177 unsigned long key);
178 178
179/* Retrieve the alternate lookup key for the hostinfo bound to this
180 * driver/host */
181unsigned long hpsb_get_hostinfo_key(struct hpsb_highlevel *hl,
182 struct hpsb_host *host);
183
184/* Retrieve a hostinfo pointer bound to this driver using its alternate key */ 179/* Retrieve a hostinfo pointer bound to this driver using its alternate key */
185void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key); 180void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key);
186 181
@@ -189,8 +184,4 @@ void *hpsb_get_hostinfo_bykey(struct hpsb_highlevel *hl, unsigned long key);
189int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host, 184int hpsb_set_hostinfo(struct hpsb_highlevel *hl, struct hpsb_host *host,
190 void *data); 185 void *data);
191 186
192/* Retrieve hpsb_host using a highlevel handle and a key */
193struct hpsb_host *hpsb_get_host_bykey(struct hpsb_highlevel *hl,
194 unsigned long key);
195
196#endif /* IEEE1394_HIGHLEVEL_H */ 187#endif /* IEEE1394_HIGHLEVEL_H */
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index dbeba45a031e..874d4d47a19c 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1756,7 +1756,7 @@ int nodemgr_for_each_host(void *__data, int (*cb)(struct hpsb_host *, void *))
1756 return error; 1756 return error;
1757} 1757}
1758 1758
1759/* The following four convenience functions use a struct node_entry 1759/* The following two convenience functions use a struct node_entry
1760 * for addressing a node on the bus. They are intended for use by any 1760 * for addressing a node on the bus. They are intended for use by any
1761 * process context, not just the nodemgr thread, so we need to be a 1761 * process context, not just the nodemgr thread, so we need to be a
1762 * little careful when reading out the node ID and generation. The 1762 * little careful when reading out the node ID and generation. The
diff --git a/drivers/ieee1394/nodemgr.h b/drivers/ieee1394/nodemgr.h
index 4147303ad448..a31405ff6eeb 100644
--- a/drivers/ieee1394/nodemgr.h
+++ b/drivers/ieee1394/nodemgr.h
@@ -167,12 +167,8 @@ static inline int hpsb_node_entry_valid(struct node_entry *ne)
167 */ 167 */
168void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *pkt); 168void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *pkt);
169 169
170int hpsb_node_read(struct node_entry *ne, u64 addr,
171 quadlet_t *buffer, size_t length);
172int hpsb_node_write(struct node_entry *ne, u64 addr, 170int hpsb_node_write(struct node_entry *ne, u64 addr,
173 quadlet_t *buffer, size_t length); 171 quadlet_t *buffer, size_t length);
174int hpsb_node_lock(struct node_entry *ne, u64 addr,
175 int extcode, quadlet_t *data, quadlet_t arg);
176 172
177/* Iterate the hosts, calling a given function with supplied data for each 173/* Iterate the hosts, calling a given function with supplied data for each
178 * host. */ 174 * host. */