From patchwork Mon Jul 26 15:39:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 114296 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6QFd00I012950 for ; Mon, 26 Jul 2010 15:39:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752920Ab0GZPi7 (ORCPT ); Mon, 26 Jul 2010 11:38:59 -0400 Received: from mailout-de.gmx.net ([213.165.64.22]:40248 "HELO mail.gmx.net" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1752658Ab0GZPi7 (ORCPT ); Mon, 26 Jul 2010 11:38:59 -0400 Received: (qmail invoked by alias); 26 Jul 2010 15:38:56 -0000 Received: from p57BD0776.dip0.t-ipconnect.de (EHLO axis700.grange) [87.189.7.118] by mail.gmx.net (mp038) with SMTP; 26 Jul 2010 17:38:56 +0200 X-Authenticated: #20450766 X-Provags-ID: V01U2FsdGVkX18aZP09L48aqN8Dg5b+oGOcdfbo2+JUBrRnhDNzXv vVcV8fAVRx2AgF Received: from lyakh (helo=localhost) by axis700.grange with local-esmtp (Exim 4.63) (envelope-from ) id 1OdPlr-0002T4-3R for linux-media@vger.kernel.org; Mon, 26 Jul 2010 17:39:15 +0200 Date: Mon, 26 Jul 2010 17:39:15 +0200 (CEST) From: Guennadi Liakhovetski To: Linux Media Mailing List Subject: V4L2: avoid name conflicts in macros Message-ID: MIME-Version: 1.0 X-Y-GMX-Trusted: 0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Jul 2010 15:39:01 +0000 (UTC) diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h index 5d5d550..aaa9f00 100644 --- a/include/media/v4l2-device.h +++ b/include/media/v4l2-device.h @@ -99,11 +99,11 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); while walking the subdevs list. */ #define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...) \ do { \ - struct v4l2_subdev *sd; \ + struct v4l2_subdev *__sd; \ \ - list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) \ - if ((cond) && sd->ops->o && sd->ops->o->f) \ - sd->ops->o->f(sd , ##args); \ + list_for_each_entry(__sd, &(v4l2_dev)->subdevs, list) \ + if ((cond) && __sd->ops->o && __sd->ops->o->f) \ + __sd->ops->o->f(__sd , ##args); \ } while (0) /* Call the specified callback for all subdevs matching the condition. @@ -112,16 +112,16 @@ void v4l2_device_unregister_subdev(struct v4l2_subdev *sd); subdev while walking the subdevs list. */ #define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \ ({ \ - struct v4l2_subdev *sd; \ - long err = 0; \ + struct v4l2_subdev *__sd; \ + long __err = 0; \ \ - list_for_each_entry(sd, &(v4l2_dev)->subdevs, list) { \ - if ((cond) && sd->ops->o && sd->ops->o->f) \ - err = sd->ops->o->f(sd , ##args); \ - if (err && err != -ENOIOCTLCMD) \ + list_for_each_entry(__sd, &(v4l2_dev)->subdevs, list) { \ + if ((cond) && __sd->ops->o && __sd->ops->o->f) \ + __err = __sd->ops->o->f(__sd , ##args); \ + if (__err && __err != -ENOIOCTLCMD) \ break; \ } \ - (err == -ENOIOCTLCMD) ? 0 : err; \ + (__err == -ENOIOCTLCMD) ? 0 : __err; \ }) /* Call the specified callback for all subdevs matching grp_id (if 0, then