aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2005-12-01 18:52:01 -0500
committerJody McIntyre <scjody@modernduck.com>2005-12-01 18:52:01 -0500
commit546513f9fd96cba613cc2d025ee03d32d79394b7 (patch)
tree37e44d9741d6cb2c389b176105144a0d936f29e6
parentd7758461b9a8253f1c125e5907579e0594d29e3b (diff)
ieee1394: hpsb_send_phy_config() cleanup
Eliminate some code in hpsb_send_phy_config() which is provided by hpsb_make_phypacket(). Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Signed-off-by: Jody McIntyre <scjody@modernduck.com>
-rw-r--r--drivers/ieee1394/ieee1394_core.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/ieee1394/ieee1394_core.c b/drivers/ieee1394/ieee1394_core.c
index f2f5e4805b5f..ff8a40980607 100644
--- a/drivers/ieee1394/ieee1394_core.c
+++ b/drivers/ieee1394/ieee1394_core.c
@@ -463,6 +463,7 @@ void hpsb_packet_sent(struct hpsb_host *host, struct hpsb_packet *packet,
463int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt) 463int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt)
464{ 464{
465 struct hpsb_packet *packet; 465 struct hpsb_packet *packet;
466 quadlet_t d = 0;
466 int retval = 0; 467 int retval = 0;
467 468
468 if (rootid >= ALL_NODES || rootid < -1 || gapcnt > 0x3f || gapcnt < -1 || 469 if (rootid >= ALL_NODES || rootid < -1 || gapcnt > 0x3f || gapcnt < -1 ||
@@ -472,26 +473,16 @@ int hpsb_send_phy_config(struct hpsb_host *host, int rootid, int gapcnt)
472 return -EINVAL; 473 return -EINVAL;
473 } 474 }
474 475
475 packet = hpsb_alloc_packet(0);
476 if (!packet)
477 return -ENOMEM;
478
479 packet->host = host;
480 packet->header_size = 8;
481 packet->data_size = 0;
482 packet->expect_response = 0;
483 packet->no_waiter = 0;
484 packet->type = hpsb_raw;
485 packet->header[0] = 0;
486 if (rootid != -1) 476 if (rootid != -1)
487 packet->header[0] |= rootid << 24 | 1 << 23; 477 d |= PHYPACKET_PHYCONFIG_R | rootid << PHYPACKET_PORT_SHIFT;
488 if (gapcnt != -1) 478 if (gapcnt != -1)
489 packet->header[0] |= gapcnt << 16 | 1 << 22; 479 d |= PHYPACKET_PHYCONFIG_T | gapcnt << PHYPACKET_GAPCOUNT_SHIFT;
490 480
491 packet->header[1] = ~packet->header[0]; 481 packet = hpsb_make_phypacket(host, d);
482 if (!packet)
483 return -ENOMEM;
492 484
493 packet->generation = get_hpsb_generation(host); 485 packet->generation = get_hpsb_generation(host);
494
495 retval = hpsb_send_packet_and_wait(packet); 486 retval = hpsb_send_packet_and_wait(packet);
496 hpsb_free_packet(packet); 487 hpsb_free_packet(packet);
497 488