Partially revert new Work Utility statistic

- Since Utility reflects actual shares accepted, and this does not, it is inconsistent and gives users a wrong impression
- BFGMiner already has the Utility Hashrate which is adjusted for target differences, so this would be redundant if corrected

This reverts commit f6d2853c9b1c403bfd228b8b9e2f40ac83387389.
This partially reverts commit ed3eb5771a97ee5f27365362e3df9ef7a549077f.

Conflicts:

	README
	miner.c

README

@@ -390,7 +390,7 @@ The number of hardware erorrs
 The utility defines as the number of shares / minute
 
 The BFGMiner status line shows:
- TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  GW: 301  LW: 8  GF: 1  RF: 1  WU:4.4/m
+ TQ: 1  ST: 1  SS: 0  DW: 0  NB: 1  GW: 301  LW: 8  GF: 1  RF: 1
 
 TQ is Total Queued work items.
 ST is STaged work items (ready to use).
@@ -401,7 +401,6 @@ GW is GetWork requested (work items from pools)
 LW is Locally generated Work items
 GF is Getwork Fail Occasions (server slow to provide work)
 RF is Remote Fail occasions (server slow to accept work)
-WU is Work Utility (Rate of difficulty 1 shares solved per minute)
 
 NOTE: Running intensities above 9 with current hardware is likely to only
 diminish return performance even if the hash rate might appear better. A good

miner.c

@@ -1638,10 +1638,10 @@ static void curses_print_status(void)
 	mvwhline(statuswin, 1, 0, '-', 80);
 	mvwprintw(statuswin, 2, 0, " %s", statusline);
 	wclrtoeol(statuswin);
-	mvwprintw(statuswin, 3, 0, " TQ: %d  ST: %d  SS: %d  DW: %d  NB: %d  GW: %d  LW: %d  GF: %d  RF: %d  WU: %.1f",
+	mvwprintw(statuswin, 3, 0, " TQ: %d  ST: %d  SS: %d  DW: %d  NB: %d  GW: %d  LW: %d  GF: %d  RF: %d",
 		global_queued(), total_staged(), total_stale, total_discarded, new_blocks,
 		total_getworks,
-		local_work, total_go, total_ro, total_diff1 / total_secs * 60);
+		local_work, total_go, total_ro);
 	wclrtoeol(statuswin);
 	if ((pool_strategy == POOL_LOADBALANCE  || pool_strategy == POOL_BALANCE) && total_pools > 1)
 		mvwprintw(statuswin, 4, 0, " Connected to multiple pools with%s LP",
@@ -5361,8 +5361,7 @@ static void print_summary(void)
 		applog(LOG_WARNING, "Reject ratio: %.1f%%", (double)(total_rejected * 100) / (double)(total_accepted + total_rejected));
 	applog(LOG_WARNING, "Hardware errors: %d", hw_errors);
 	applog(LOG_WARNING, "Efficiency (accepted / queued): %.0f%%", efficiency);
-	applog(LOG_WARNING, "Utility (accepted shares / min): %.2f/min", utility);
-	applog(LOG_WARNING, "Work Utility (diff1 shares solved / min): %.2f/min\n", work_util);
+	applog(LOG_WARNING, "Utility (accepted shares / min): %.2f/min\n", utility);
 
 	applog(LOG_WARNING, "Discarded work due to new blocks: %d", total_discarded);
 	applog(LOG_WARNING, "Stale submissions discarded due to new blocks: %d", total_stale);