# HG changeset patch # User Florian Pose # Date 1341821132 -7200 # Node ID 2565cb4d9e31beea02bde0f7ff2fb248f714d860 # Parent ca345abf0565ee1b2218e99a32491a8ec059ae66 Removed whitespace. diff -r ca345abf0565 -r 2565cb4d9e31 master/module.c --- a/master/module.c Tue Apr 10 19:10:56 2012 +0200 +++ b/master/module.c Mon Jul 09 10:05:32 2012 +0200 @@ -127,7 +127,7 @@ ret = ec_mac_parse(macs[i][0], main_devices[i], 0); if (ret) goto out_class; - + if (i < backup_count) { ret = ec_mac_parse(macs[i][1], backup_devices[i], 1); if (ret) @@ -137,7 +137,7 @@ // initialize static master variables ec_master_init_static(); - + if (master_count) { if (!(masters = kmalloc(sizeof(ec_master_t) * master_count, GFP_KERNEL))) { @@ -147,14 +147,14 @@ goto out_class; } } - + for (i = 0; i < master_count; i++) { ret = ec_master_init(&masters[i], i, macs[i][0], macs[i][1], device_number, class, debug_level); if (ret) goto out_free_masters; } - + EC_INFO("%u master%s waiting for devices.\n", master_count, (master_count == 1 ? "" : "s")); return ret; @@ -188,12 +188,12 @@ if (master_count) kfree(masters); - + class_destroy(class); - + if (master_count) unregister_chrdev_region(device_number, master_count); - + EC_INFO("Master module cleaned up.\n"); } @@ -219,14 +219,14 @@ ) { unsigned int i; - + for (i = 0; i < ETH_ALEN; i++) if (mac1[i] != mac2[i]) return 0; return 1; } - + /*****************************************************************************/ /** Print a MAC address to a buffer. @@ -240,7 +240,7 @@ { off_t off = 0; unsigned int i; - + for (i = 0; i < ETH_ALEN; i++) { off += sprintf(buffer + off, "%02X", mac[i]); if (i < ETH_ALEN - 1) off += sprintf(buffer + off, ":"); @@ -259,7 +259,7 @@ ) { unsigned int i; - + for (i = 0; i < ETH_ALEN; i++) if (mac[i]) return 0; @@ -277,7 +277,7 @@ ) { unsigned int i; - + for (i = 0; i < ETH_ALEN; i++) if (mac[i] != 0xff) return 0; @@ -473,7 +473,7 @@ up(&master->device_sem); continue; } - + if (ec_mac_equal(master->main_mac, net_dev->dev_addr) || ec_mac_is_broadcast(master->main_mac)) { ec_mac_print(net_dev->dev_addr, str); @@ -482,7 +482,7 @@ ec_device_attach(&master->main_device, net_dev, poll, module); up(&master->device_sem); - + snprintf(net_dev->name, IFNAMSIZ, "ec%u", master->index); return &master->main_device; // offer accepted @@ -542,7 +542,7 @@ errptr = ERR_PTR(-EINTR); goto out_release; } - + if (master->phase != EC_IDLE) { up(&master->device_sem); EC_MASTER_ERR(master, "Master still waiting for devices!\n");