From patchwork Sun Nov 29 20:05:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thiago Farina X-Patchwork-Id: 63576 X-Patchwork-Delegate: dougsland@redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nATK6xv5017164 for ; Sun, 29 Nov 2009 20:06:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752298AbZK2UGL (ORCPT ); Sun, 29 Nov 2009 15:06:11 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752186AbZK2UGL (ORCPT ); Sun, 29 Nov 2009 15:06:11 -0500 Received: from mail-qy0-f194.google.com ([209.85.221.194]:38374 "EHLO mail-qy0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752015AbZK2UGK (ORCPT ); Sun, 29 Nov 2009 15:06:10 -0500 Received: by qyk32 with SMTP id 32so1251303qyk.4 for ; Sun, 29 Nov 2009 12:06:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=iaoJHV24l77xZ19xgFOjiuTUDeUpX9DUCRZxJ/EVyVU=; b=LdpmVFLkUIlGedi51uOPfcSh6buSqfmA9fRNfau36TLUApFW2xNrDqGN8GWmOxZff2 NE8M5qrbx3q0z/XvtZlVTcnhgvzQ33LHkT7ixJ59pCAaHPi9burVic6G19KJbUmCz9Ad rE1JwNF8gcmWXIieBe0sBKwK884iVcF+3R+fg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=plCry1aSi/I8bnEPnHLCTcp6JkYZDxbH+FhHs6BJCuG9o8LkrUI11FnZwvaNuDCyPk lV3ayhw26JTFh5tIAqz7IOlSUSZjb0F2sdywJDGGubk++0iCa1i9otLECPWOUrERCsF1 YwXY6Jgxv7f6ZvDvFBt34x85jX7YRT0pDZ3YY= Received: by 10.224.34.230 with SMTP id m38mr1683295qad.284.1259525175339; Sun, 29 Nov 2009 12:06:15 -0800 (PST) Received: from localhost ([201.53.2.165]) by mx.google.com with ESMTPS id 7sm9582356qwf.24.2009.11.29.12.06.13 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 29 Nov 2009 12:06:14 -0800 (PST) From: Thiago Farina To: linux-kernel@vger.kernel.org Cc: mchehab@infradead.org, hverkuil@xs4all.nl, alan@redhat.com, roel.kluin@gmail.com, linux-media@vger.kernel.org, Thiago Farina Subject: [PATCH] cpia2: use __stringify macro. Date: Sun, 29 Nov 2009 15:05:58 -0500 Message-Id: <1259525158-16517-1-git-send-email-tfransosi@gmail.com> X-Mailer: git-send-email 1.6.6.rc0.61.g41d5b Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/video/cpia2/cpia2_v4l.c b/drivers/media/video/cpia2/cpia2_v4l.c index 0b4a8f3..6c5fcd8 100644 --- a/drivers/media/video/cpia2/cpia2_v4l.c +++ b/drivers/media/video/cpia2/cpia2_v4l.c @@ -38,17 +38,12 @@ #include #include #include +#include #include #include "cpia2.h" #include "cpia2dev.h" - -//#define _CPIA2_DEBUG_ - -#define MAKE_STRING_1(x) #x -#define MAKE_STRING(x) MAKE_STRING_1(x) - static int video_nr = -1; module_param(video_nr, int, 0); MODULE_PARM_DESC(video_nr,"video device to register (0=/dev/video0, etc)"); @@ -60,26 +55,26 @@ MODULE_PARM_DESC(buffer_size, "Size for each frame buffer in bytes (default 68k) static int num_buffers = 3; module_param(num_buffers, int, 0); MODULE_PARM_DESC(num_buffers, "Number of frame buffers (1-" - MAKE_STRING(VIDEO_MAX_FRAME) ", default 3)"); + __stringify(VIDEO_MAX_FRAME) ", default 3)"); static int alternate = DEFAULT_ALT; module_param(alternate, int, 0); -MODULE_PARM_DESC(alternate, "USB Alternate (" MAKE_STRING(USBIF_ISO_1) "-" - MAKE_STRING(USBIF_ISO_6) ", default " - MAKE_STRING(DEFAULT_ALT) ")"); +MODULE_PARM_DESC(alternate, "USB Alternate (" __stringify(USBIF_ISO_1) "-" + __stringify(USBIF_ISO_6) ", default " + __stringify(DEFAULT_ALT) ")"); static int flicker_freq = 60; module_param(flicker_freq, int, 0); -MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" MAKE_STRING(50) "or" - MAKE_STRING(60) ", default " - MAKE_STRING(60) ")"); +MODULE_PARM_DESC(flicker_freq, "Flicker frequency (" __stringify(50) "or" + __stringify(60) ", default " + __stringify(60) ")"); static int flicker_mode = NEVER_FLICKER; module_param(flicker_mode, int, 0); MODULE_PARM_DESC(flicker_mode, - "Flicker supression (" MAKE_STRING(NEVER_FLICKER) "or" - MAKE_STRING(ANTI_FLICKER_ON) ", default " - MAKE_STRING(NEVER_FLICKER) ")"); + "Flicker supression (" __stringify(NEVER_FLICKER) "or" + __stringify(ANTI_FLICKER_ON) ", default " + __stringify(NEVER_FLICKER) ")"); MODULE_AUTHOR("Steve Miller (STMicroelectronics) "); MODULE_DESCRIPTION("V4L-driver for STMicroelectronics CPiA2 based cameras");