From patchwork Sun Mar 15 09:20:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 12174 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 n2F9Kw1b029415 for ; Sun, 15 Mar 2009 09:20:58 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbZCOJU6 (ORCPT ); Sun, 15 Mar 2009 05:20:58 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753366AbZCOJU6 (ORCPT ); Sun, 15 Mar 2009 05:20:58 -0400 Received: from zone0.gcu-squad.org ([212.85.147.21]:3785 "EHLO services.gcu-squad.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbZCOJU4 (ORCPT ); Sun, 15 Mar 2009 05:20:56 -0400 Received: from jdelvare.pck.nerim.net ([62.212.121.182] helo=hyperion.delvare) by services.gcu-squad.org (GCU Mailer Daemon) with esmtpsa id 1Linav-0006tG-B1 (TLSv1:AES256-SHA:256) (envelope-from ) ; Sun, 15 Mar 2009 11:29:25 +0100 Date: Sun, 15 Mar 2009 10:20:45 +0100 From: Jean Delvare To: LMML Cc: Hans Verkuil , Trent Piepho Subject: [PATCH] Fix notify callback prototype Message-ID: <20090315102045.5ea33d34@hyperion.delvare> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.14.4; x86_64-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org I see the following warning when building the zoran driver: v4l/zoran_card.c: In function 'zoran_probe': v4l/zoran_card.c:1243: warning: assignment from incompatible pointer type Fixing the notify callback prototype solves it. Signed-off-by: Jean Delvare Cc: Hans Verkuil Cc: Trent Piepho --- linux/drivers/media/video/zoran/zoran_card.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- v4l-dvb.orig/linux/drivers/media/video/zoran/zoran_card.c 2009-03-15 10:09:47.000000000 +0100 +++ v4l-dvb/linux/drivers/media/video/zoran/zoran_card.c 2009-03-15 10:17:26.000000000 +0100 @@ -1197,7 +1197,7 @@ zoran_setup_videocodec (struct zoran *zr return m; } -static int zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg) +static void zoran_subdev_notify(struct v4l2_subdev *sd, unsigned int cmd, void *arg) { struct zoran *zr = to_zoran(sd->v4l2_dev); @@ -1207,7 +1207,6 @@ static int zoran_subdev_notify(struct v4 GPIO(zr, 7, 0); else if (cmd == BT819_FIFO_RESET_HIGH) GPIO(zr, 7, 1); - return 0; } /*