From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757202AbbIUPGR (ORCPT ); Mon, 21 Sep 2015 11:06:17 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:33223 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756913AbbIUPBe (ORCPT ); Mon, 21 Sep 2015 11:01:34 -0400 From: Peter Senna Tschudin To: balbi@ti.com, stern@rowland.harvard.edu, sergei.shtylyov@cogentembedded.com, standby24x7@gmail.com, pmladek@suse.cz, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org Cc: Peter Senna Tschudin Subject: [PATCH 07/14] RFC: usb/host/fotg210: Remove a macro from snprintf Date: Mon, 21 Sep 2015 17:01:11 +0200 Message-Id: <1442847678-7970-8-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1442847678-7970-1-git-send-email-peter.senna@gmail.com> References: <20150915165002.GP19948@saruman.tx.rr.com> <1442847678-7970-1-git-send-email-peter.senna@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch removes a macro from a call to snprintf() and moves it's content to just before the call to snprintf() assigning a value to a new variable named tmp. The goal of this patch is to make the code easier to understand. Signed-off-by: Peter Senna Tschudin --- drivers/usb/host/fotg210-hcd.c | 43 ++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/drivers/usb/host/fotg210-hcd.c b/drivers/usb/host/fotg210-hcd.c index 55c2279..4032ed0 100644 --- a/drivers/usb/host/fotg210-hcd.c +++ b/drivers/usb/host/fotg210-hcd.c @@ -367,6 +367,8 @@ static void qh_lines(struct fotg210_hcd *fotg210, struct fotg210_qh *qh, unsigned size = *sizep; char *next = *nextp; char mark; + char *tmp; + __le32 list_end = FOTG210_LIST_END(fotg210); struct fotg210_qh_hw *hw = qh->hw; @@ -411,28 +413,29 @@ static void qh_lines(struct fotg210_hcd *fotg210, struct fotg210_qh *qh, else if (td->hw_alt_next != list_end) mark = '/'; } - temp = snprintf(next, size, - "\n\t%p%c%s len=%d %08x urb %p", - td, mark, ({ char *tmp; - switch ((scratch>>8)&0x03) { - case 0: - tmp = "out"; - break; - case 1: - tmp = "in"; - break; - case 2: - tmp = "setup"; - break; - default: - tmp = "?"; - break; - } tmp; }), - (scratch >> 16) & 0x7fff, - scratch, - td->urb); + + switch ((scratch >> 8) & 0x03) { + case 0: + tmp = "out"; + break; + case 1: + tmp = "in"; + break; + case 2: + tmp = "setup"; + break; + default: + tmp = "?"; + break; + } + + temp = snprintf(next, size, "\n\t%p%c%s len=%d %08x urb %p", + td, mark, tmp, (scratch >> 16) & 0x7fff, + scratch, td->urb); + if (size < temp) temp = size; + size -= temp; next += temp; if (temp == size) -- 2.1.0