Date: Wed, 22 Nov 2006 21:28:19 +0100 (CET) From: Stefan Richter Subject: ieee1394: nodemgr: spaces to tabs whitespace pedantry Signed-off-by: Stefan Richter --- drivers/ieee1394/nodemgr.c | 108 ++++++++++++++++++------------------- 1 files changed, 54 insertions(+), 54 deletions(-) Index: linux/drivers/ieee1394/nodemgr.c =================================================================== --- linux.orig/drivers/ieee1394/nodemgr.c 2006-11-22 21:20:15.000000000 +0100 +++ linux/drivers/ieee1394/nodemgr.c 2006-11-22 21:23:22.000000000 +0100 @@ -99,7 +99,7 @@ static int nodemgr_check_speed(struct no } static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length, - void *buffer, void *__ci) + void *buffer, void *__ci) { struct nodemgr_csr_info *ci = (struct nodemgr_csr_info*)__ci; int i, error; @@ -318,8 +318,8 @@ static ssize_t fw_drv_show_##field (stru return sprintf(buf, format_string, (type)driver->field);\ } \ static struct driver_attribute driver_attr_drv_##field = { \ - .attr = {.name = __stringify(field), .mode = S_IRUGO }, \ - .show = fw_drv_show_##field, \ + .attr = {.name = __stringify(field), .mode = S_IRUGO }, \ + .show = fw_drv_show_##field, \ }; @@ -540,7 +540,7 @@ static ssize_t fw_show_drv_device_ids(st int length = 0; char *scratch = buf; - driver = container_of(drv, struct hpsb_protocol_driver, driver); + driver = container_of(drv, struct hpsb_protocol_driver, driver); for (id = driver->id_table; id->match_flags != 0; id++) { int need_coma = 0; @@ -707,8 +707,8 @@ fail: static int nodemgr_bus_match(struct device * dev, struct device_driver * drv) { - struct hpsb_protocol_driver *driver; - struct unit_directory *ud; + struct hpsb_protocol_driver *driver; + struct unit_directory *ud; struct ieee1394_device_id *id; /* We only match unit directories */ @@ -724,25 +724,25 @@ static int nodemgr_bus_match(struct devi return 0; driver = container_of(drv, struct hpsb_protocol_driver, driver); - for (id = driver->id_table; id->match_flags != 0; id++) { - if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) && - id->vendor_id != ud->vendor_id) - continue; - - if ((id->match_flags & IEEE1394_MATCH_MODEL_ID) && - id->model_id != ud->model_id) - continue; - - if ((id->match_flags & IEEE1394_MATCH_SPECIFIER_ID) && - id->specifier_id != ud->specifier_id) - continue; - - if ((id->match_flags & IEEE1394_MATCH_VERSION) && - id->version != ud->version) - continue; + for (id = driver->id_table; id->match_flags != 0; id++) { + if ((id->match_flags & IEEE1394_MATCH_VENDOR_ID) && + id->vendor_id != ud->vendor_id) + continue; + + if ((id->match_flags & IEEE1394_MATCH_MODEL_ID) && + id->model_id != ud->model_id) + continue; + + if ((id->match_flags & IEEE1394_MATCH_SPECIFIER_ID) && + id->specifier_id != ud->specifier_id) + continue; + + if ((id->match_flags & IEEE1394_MATCH_VERSION) && + id->version != ud->version) + continue; return 1; - } + } return 0; } @@ -851,16 +851,16 @@ static void nodemgr_update_bus_options(s #endif quadlet_t busoptions = be32_to_cpu(ne->csr->bus_info_data[2]); - ne->busopt.irmc = (busoptions >> 31) & 1; - ne->busopt.cmc = (busoptions >> 30) & 1; - ne->busopt.isc = (busoptions >> 29) & 1; - ne->busopt.bmc = (busoptions >> 28) & 1; - ne->busopt.pmc = (busoptions >> 27) & 1; - ne->busopt.cyc_clk_acc = (busoptions >> 16) & 0xff; - ne->busopt.max_rec = 1 << (((busoptions >> 12) & 0xf) + 1); + ne->busopt.irmc = (busoptions >> 31) & 1; + ne->busopt.cmc = (busoptions >> 30) & 1; + ne->busopt.isc = (busoptions >> 29) & 1; + ne->busopt.bmc = (busoptions >> 28) & 1; + ne->busopt.pmc = (busoptions >> 27) & 1; + ne->busopt.cyc_clk_acc = (busoptions >> 16) & 0xff; + ne->busopt.max_rec = 1 << (((busoptions >> 12) & 0xf) + 1); ne->busopt.max_rom = (busoptions >> 8) & 0x3; - ne->busopt.generation = (busoptions >> 4) & 0xf; - ne->busopt.lnkspd = busoptions & 0x7; + ne->busopt.generation = (busoptions >> 4) & 0xf; + ne->busopt.lnkspd = busoptions & 0x7; HPSB_VERBOSE("NodeMgr: raw=0x%08x irmc=%d cmc=%d isc=%d bmc=%d pmc=%d " "cyc_clk_acc=%d max_rec=%d max_rom=%d gen=%d lspd=%d", @@ -953,7 +953,7 @@ static struct node_entry *find_entry_by_ } up(&nodemgr_ne_class.sem); - return ret_ne; + return ret_ne; } @@ -1415,22 +1415,22 @@ static void nodemgr_node_scan_one(struct static void nodemgr_node_scan(struct host_info *hi, int generation) { - int count; - struct hpsb_host *host = hi->host; - struct selfid *sid = (struct selfid *)host->topology_map; - nodeid_t nodeid = LOCAL_BUS; - - /* Scan each node on the bus */ - for (count = host->selfid_count; count; count--, sid++) { - if (sid->extended) - continue; - - if (!sid->link_active) { - nodeid++; - continue; - } - nodemgr_node_scan_one(hi, nodeid++, generation); - } + int count; + struct hpsb_host *host = hi->host; + struct selfid *sid = (struct selfid *)host->topology_map; + nodeid_t nodeid = LOCAL_BUS; + + /* Scan each node on the bus */ + for (count = host->selfid_count; count; count--, sid++) { + if (sid->extended) + continue; + + if (!sid->link_active) { + nodeid++; + continue; + } + nodemgr_node_scan_one(hi, nodeid++, generation); + } } @@ -1596,7 +1596,7 @@ static void nodemgr_node_probe(struct ho if (ne->needs_probe) nodemgr_probe_ne(hi, ne, generation); } - up(&nodemgr_ne_class.sem); + up(&nodemgr_ne_class.sem); /* If we had a bus reset while we were scanning the bus, it is @@ -1840,10 +1840,10 @@ int nodemgr_for_each_host(void *__data, void hpsb_node_fill_packet(struct node_entry *ne, struct hpsb_packet *pkt) { - pkt->host = ne->host; - pkt->generation = ne->generation; + pkt->host = ne->host; + pkt->generation = ne->generation; barrier(); - pkt->node_id = ne->nodeid; + pkt->node_id = ne->nodeid; } int hpsb_node_write(struct node_entry *ne, u64 addr, @@ -1921,7 +1921,7 @@ int init_ieee1394_nodemgr(void) void cleanup_ieee1394_nodemgr(void) { - hpsb_unregister_highlevel(&nodemgr_highlevel); + hpsb_unregister_highlevel(&nodemgr_highlevel); class_unregister(&nodemgr_ud_class); class_unregister(&nodemgr_ne_class);