[PATCH] drivers/staging/batman-adv: fix function prototype

[PATCH] drivers/staging/batman-adv: fix function prototype

[Javier Martinez Canillas]

In today linux-next I got a compile warning in staging/batman-adv.

This is due a struct bin_attribute read function prototype change and the driver was not updated.

This patch solves the issue

Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
---
 drivers/staging/batman-adv/bat_sysfs.c |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/batman-adv/bat_sysfs.c b/drivers/staging/batman-adv/bat_sysfs.c
index e2c000b..212bc21 100644
--- a/drivers/staging/batman-adv/bat_sysfs.c
+++ b/drivers/staging/batman-adv/bat_sysfs.c
@@ -225,9 +225,9 @@ static struct bat_attribute *mesh_attrs[] = {
 	NULL,
 };
 
-static ssize_t transtable_local_read(struct kobject *kobj,
-			       struct bin_attribute *bin_attr,
-			       char *buff, loff_t off, size_t count)
+static ssize_t transtable_local_read(struct file *filp, struct kobject *kobj,
+				  struct bin_attribute *bin_attr,
+				  char *buff, loff_t off, size_t count)
 {
 	struct device *dev = to_dev(kobj->parent);
 	struct net_device *net_dev = to_net_dev(dev);
@@ -235,9 +235,9 @@ static ssize_t transtable_local_read(struct kobject *kobj,
 	return hna_local_fill_buffer_text(net_dev, buff, count, off);
 }
 
-static ssize_t transtable_global_read(struct kobject *kobj,
-			       struct bin_attribute *bin_attr,
-			       char *buff, loff_t off, size_t count)
+static ssize_t transtable_global_read(struct file *filp, struct kobject *kobj,
+				  struct bin_attribute *bin_attr,
+				  char *buff, loff_t off, size_t count)
 {
 	struct device *dev = to_dev(kobj->parent);
 	struct net_device *net_dev = to_net_dev(dev);
@@ -245,9 +245,9 @@ static ssize_t transtable_global_read(struct kobject *kobj,
 	return hna_global_fill_buffer_text(net_dev, buff, count, off);
 }
 
-static ssize_t originators_read(struct kobject *kobj,
-			       struct bin_attribute *bin_attr,
-			       char *buff, loff_t off, size_t count)
+static ssize_t originators_read(struct file *filp, struct kobject *kobj,
+				  struct bin_attribute *bin_attr,
+				  char *buff, loff_t off, size_t count)
 {
 	struct device *dev = to_dev(kobj->parent);
 	struct net_device *net_dev = to_net_dev(dev);
@@ -255,9 +255,9 @@ static ssize_t originators_read(struct kobject *kobj,
 	return orig_fill_buffer_text(net_dev, buff, count, off);
 }
 
-static ssize_t vis_data_read(struct kobject *kobj,
-			     struct bin_attribute *bin_attr,
-			     char *buff, loff_t off, size_t count)
+static ssize_t vis_data_read(struct file *filp, struct kobject *kobj,
+				  struct bin_attribute *bin_attr,
+				  char *buff, loff_t off, size_t count)
 {
 	struct device *dev = to_dev(kobj->parent);
 	struct net_device *net_dev = to_net_dev(dev);
-- 
1.7.0.4

Re: [PATCH] drivers/staging/batman-adv: fix function prototype

[Sven Eckelmann]

[-- Attachment #1: Type: Text/Plain, Size: 734 bytes --]

On Sunday 06 June 2010 03:23:28 you wrote:
> In today linux-next I got a compile warning in staging/batman-adv.
> 
> This is due a struct bin_attribute read function prototype change and the
> driver was not updated.
> 
> This patch solves the issue
> 
> Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> ---
[...]
> 
> -static ssize_t transtable_local_read(struct kobject *kobj,
[...]
> 
> -static ssize_t transtable_global_read(struct kobject *kobj,
[...]
> 
> -static ssize_t originators_read(struct kobject *kobj,
[...]
> 
> -static ssize_t vis_data_read(struct kobject *kobj,
[...]

These files were already removed and the patch is waiting in GregKH's queue.

Best regards,
	Sven

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drivers/staging/batman-adv: fix function prototype

[Greg KH]

On Sun, Jun 06, 2010 at 09:41:36AM +0200, Sven Eckelmann wrote:
> On Sunday 06 June 2010 03:23:28 you wrote:
> > In today linux-next I got a compile warning in staging/batman-adv.
> > 
> > This is due a struct bin_attribute read function prototype change and the
> > driver was not updated.
> > 
> > This patch solves the issue
> > 
> > Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> > ---
> [...]
> > 
> > -static ssize_t transtable_local_read(struct kobject *kobj,
> [...]
> > 
> > -static ssize_t transtable_global_read(struct kobject *kobj,
> [...]
> > 
> > -static ssize_t originators_read(struct kobject *kobj,
> [...]
> > 
> > -static ssize_t vis_data_read(struct kobject *kobj,
> [...]
> 
> These files were already removed and the patch is waiting in GregKH's queue.

Hm, but those files are not going to be removed until 2.6.36, right?  So
I think we need this patch now to keep 2.6.35 working properly.  Or am I
mistaken?

thanks,

greg k-h

Re: [PATCH] drivers/staging/batman-adv: fix function prototype

[Sven Eckelmann]

[-- Attachment #1: Type: text/plain, Size: 2197 bytes --]

On Sun, Jun 06, 2010 at 09:37:06AM -0700, Greg KH wrote:
> On Sun, Jun 06, 2010 at 09:41:36AM +0200, Sven Eckelmann wrote:
> > On Sunday 06 June 2010 03:23:28 you wrote:
> > > In today linux-next I got a compile warning in staging/batman-adv.
> > > 
> > > This is due a struct bin_attribute read function prototype change and the
> > > driver was not updated.
> > > 
> > > This patch solves the issue
> > > 
> > > Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> > > ---
> > [...]
> > > 
> > > -static ssize_t transtable_local_read(struct kobject *kobj,
> > [...]
> > > 
> > > -static ssize_t transtable_global_read(struct kobject *kobj,
> > [...]
> > > 
> > > -static ssize_t originators_read(struct kobject *kobj,
> > [...]
> > > 
> > > -static ssize_t vis_data_read(struct kobject *kobj,
> > [...]
> > 
> > These files were already removed and the patch is waiting in GregKH's queue.
> 
> Hm, but those files are not going to be removed until 2.6.36, right?  So
> I think we need this patch now to keep 2.6.35 working properly.  Or am I
> mistaken?

No, this is correct. I just wanted to write a short notice... but it was a
little bit too short.

Situation:
 * Files were removed (actually moved to debugfs) for 2.6.36
 * patches for that were already send to Greg
 * this patch conflicts with at least one patch we already sent

How it was (hopefully) resolved:
 * this and another patch was applied in our repo in a special 2.6.35 branch
 * our debugfs patches (and patches we send at the same time) were rebased
 * new patches for 2.6.35 and again _all_ patches for 2.6.36 were send to
   Greg some days ago

I hope that it is ok for Greg. Otherwise he would have to fix the merge
conflicts - extra work which (at least I think) isn't is duty. I am not happy
about the resubmission, but maybe we find a good way to coordinate the
submission of patches a little bit better.

And forgot also to thank Javier - it seems that I completely missed that change
or it came at the same time we submitted out things to Greg (not sure about
that - but in case of doubt, just say that it was my fault).

Best regards,
	Sven

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] drivers/staging/batman-adv: fix function prototype

[Greg KH]

On Wed, Jun 09, 2010 at 06:13:32PM +0200, Sven Eckelmann wrote:
> On Sun, Jun 06, 2010 at 09:37:06AM -0700, Greg KH wrote:
> > On Sun, Jun 06, 2010 at 09:41:36AM +0200, Sven Eckelmann wrote:
> > > On Sunday 06 June 2010 03:23:28 you wrote:
> > > > In today linux-next I got a compile warning in staging/batman-adv.
> > > > 
> > > > This is due a struct bin_attribute read function prototype change and the
> > > > driver was not updated.
> > > > 
> > > > This patch solves the issue
> > > > 
> > > > Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
> > > > ---
> > > [...]
> > > > 
> > > > -static ssize_t transtable_local_read(struct kobject *kobj,
> > > [...]
> > > > 
> > > > -static ssize_t transtable_global_read(struct kobject *kobj,
> > > [...]
> > > > 
> > > > -static ssize_t originators_read(struct kobject *kobj,
> > > [...]
> > > > 
> > > > -static ssize_t vis_data_read(struct kobject *kobj,
> > > [...]
> > > 
> > > These files were already removed and the patch is waiting in GregKH's queue.
> > 
> > Hm, but those files are not going to be removed until 2.6.36, right?  So
> > I think we need this patch now to keep 2.6.35 working properly.  Or am I
> > mistaken?
> 
> No, this is correct. I just wanted to write a short notice... but it was a
> little bit too short.
> 
> Situation:
>  * Files were removed (actually moved to debugfs) for 2.6.36
>  * patches for that were already send to Greg
>  * this patch conflicts with at least one patch we already sent
> 
> How it was (hopefully) resolved:
>  * this and another patch was applied in our repo in a special 2.6.35 branch
>  * our debugfs patches (and patches we send at the same time) were rebased
>  * new patches for 2.6.35 and again _all_ patches for 2.6.36 were send to
>    Greg some days ago
> 
> I hope that it is ok for Greg. Otherwise he would have to fix the merge
> conflicts - extra work which (at least I think) isn't is duty. I am not happy
> about the resubmission, but maybe we find a good way to coordinate the
> submission of patches a little bit better.

That's fine, you did great here, I will queue your patches up for .36
and the fixes for .35.  merge conflicts are my job to handle :)

thanks,

greg k-h