Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966013AbbFJQev (ORCPT ); Wed, 10 Jun 2015 12:34:51 -0400 Received: from mailrelay110.isp.belgacom.be ([195.238.20.137]:7620 "EHLO mailrelay110.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933964AbbFJQdq (ORCPT ); Wed, 10 Jun 2015 12:33:46 -0400 X-Belgacom-Dynamic: yes X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=eWtaKQUTUbzTvYESxgzcVvJXO5dQmjbJ/tTWSlQWV0k= c=1 sm=2 a=NjYAE4uN03OL0_3W2ikA:9 a=KlIQh8hVQhMNZsyU:21 a=Ru59GalvmVSF4ZWx:21 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2C5HgBcZnhV/5QztFtcgxABgTKrcwUBAQEBAQEFAYEEAZJchgmBOj0QAQEBAQEBAYEKQQOEDC8jgRo3iDIB0g+GGYowHYQXBZ8AjUaKNSRiZgGCMTwxgkcBAQE From: Fabian Frederick To: linux-kernel@vger.kernel.org Cc: Julia Lawall , Fabian Frederick , William Hubbs , Chris Brannon , Kirk Reiser , Samuel Thibault , Greg Kroah-Hartman , speakup@linux-speakup.org, devel@driverdev.osuosl.org Subject: [PATCH 1/1 linux-next] staging: speakup: use swap() in get_highlight_color() Date: Wed, 10 Jun 2015 18:33:38 +0200 Message-Id: <1433954018-24928-1-git-send-email-fabf@skynet.be> X-Mailer: git-send-email 2.4.2 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1407 Lines: 44 Use kernel.h macro definition. Thanks to Julia Lawall for Coccinelle scripting support. Signed-off-by: Fabian Frederick --- drivers/staging/speakup/main.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c index c955976..6c4f9a1 100644 --- a/drivers/staging/speakup/main.c +++ b/drivers/staging/speakup/main.c @@ -1597,7 +1597,7 @@ static int count_highlight_color(struct vc_data *vc) static int get_highlight_color(struct vc_data *vc) { int i, j; - unsigned int cptr[8], tmp; + unsigned int cptr[8]; int vc_num = vc->vc_num; for (i = 0; i < 8; i++) @@ -1606,11 +1606,8 @@ static int get_highlight_color(struct vc_data *vc) for (i = 0; i < 7; i++) for (j = i + 1; j < 8; j++) if (speakup_console[vc_num]->ht.bgcount[cptr[i]] > - speakup_console[vc_num]->ht.bgcount[cptr[j]]) { - tmp = cptr[i]; - cptr[i] = cptr[j]; - cptr[j] = tmp; - } + speakup_console[vc_num]->ht.bgcount[cptr[j]]) + swap(cptr[i], cptr[j]); for (i = 0; i < 8; i++) if (speakup_console[vc_num]->ht.bgcount[cptr[i]] != 0) -- 2.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/