From: "ext Ramirez Luna, Omar" <omar.ramirez@xxxxxx> Subject: RE: [PATCH] DSPBRIDGE: Compiler wanrning fix for unlocked_ioctl Date: Mon, 8 Jun 2009 08:49:03 +0200 > >From: Ameya Palande [mailto:ameya.palande@xxxxxxxxx] > >Subject: [PATCH] DSPBRIDGE: Compiler wanrning fix for unlocked_ioctl > > > >From: Ameya Palande <ameya.palande@xxxxxxxxx> > > > >Signed-off-by: Ameya Palande <ameya.palande@xxxxxxxxx> > >--- > > drivers/dsp/bridge/rmgr/drv_interface.c | 2 +- > > drivers/dsp/bridge/rmgr/drv_interface.h | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > >diff --git a/drivers/dsp/bridge/rmgr/drv_interface.c b/drivers/dsp/bridge/rmgr/drv_interface.c > >index c3d8a02..f41e153 100644 > >--- a/drivers/dsp/bridge/rmgr/drv_interface.c > >+++ b/drivers/dsp/bridge/rmgr/drv_interface.c > >@@ -665,7 +665,7 @@ static int bridge_release(struct inode *ip, struct file *filp) > > } > > > > /* This function provides IO interface to the bridge driver. */ > >-static int bridge_ioctl(struct file *filp, unsigned int code, > >+static long bridge_ioctl(struct file *filp, unsigned int code, > > unsigned long args) > > { > > int status; > >diff --git a/drivers/dsp/bridge/rmgr/drv_interface.h b/drivers/dsp/bridge/rmgr/drv_interface.h > >index 3e77ed0..dc49210 100644 > >--- a/drivers/dsp/bridge/rmgr/drv_interface.h > >+++ b/drivers/dsp/bridge/rmgr/drv_interface.h > >@@ -34,7 +34,7 @@ static int __init bridge_init(void); /* Initialize bridge */ > > static void __exit bridge_exit(void); /* Opposite of initialize */ > > static int bridge_open(struct inode *, struct file *); /* Open */ > > static int bridge_release(struct inode *, struct file *); /* Release */ > >-static int bridge_ioctl(struct file *, unsigned int, > >+static long bridge_ioctl(struct file *, unsigned int, > > unsigned long); > > static int bridge_mmap(struct file *filp, struct vm_area_struct *vma); > > #endif /* ifndef _DRV_INTERFACE_H_ */ > >-- > >1.6.2.4 > > > > Pushed to bridge tree on dev.omapzoom.org Thanks. Also there still seems to remain 2 patches: http://marc.info/?l=linux-omap&m=124201773423895&w=2 http://marc.info/?l=linux-omap&m=124201773423892&w=2 I think that the first one should be merged into d.o-z.org now, but for the second one about 128 byte alignment. let me know your thought/plan on it. > > - omar > -- > To unsubscribe from this list: send the line "unsubscribe linux-omap" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
