Re: [PATCH] sisusb: fix build (Re: 2.6.17-rc5-mm3: sisusbvga buildfailure)

[Randy.Dunlap]

On Mon, 5 Jun 2006 23:00:14 +0200 Adrian Bunk wrote:

> Thanks for fixing this.
> 
> It looks good with the exception of:
> 
> > -static int
> > +int
> >  sisusb_setidxregmask(struct sisusb_usb_data *sisusb, int port, u8 idx,
> >  							u8 data, u8 mask)
> >  {
> >...
> 
> This hunk doesn't seem to be required.

Agreed, verified.  Andrew, this patch replaces the one from last night.
---

From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>

Fix build errors caused by agressive static attributes.

Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
---
 drivers/usb/misc/sisusbvga/sisusb.c |   15 ---------------
 drivers/usb/misc/sisusbvga/sisusb.h |    2 --
 2 files changed, 17 deletions(-)

--- linux-2617-rc5mm3.orig/drivers/usb/misc/sisusbvga/sisusb.h
+++ linux-2617-rc5mm3/drivers/usb/misc/sisusbvga/sisusb.h
@@ -62,11 +62,9 @@
 #define INCL_SISUSB_CON		1
 #endif
 
-#ifdef INCL_SISUSB_CON
 #include <linux/console.h>
 #include <linux/vt_kern.h>
 #include "sisusb_struct.h"
-#endif
 
 /* USB related */
 
--- linux-2617-rc5mm3.orig/drivers/usb/misc/sisusbvga/sisusb.c
+++ linux-2617-rc5mm3/drivers/usb/misc/sisusbvga/sisusb.c
@@ -1331,9 +1331,6 @@ sisusb_getreg(struct sisusb_usb_data *si
 }
 #endif
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 data)
 {
@@ -1343,9 +1340,6 @@ sisusb_setidxreg(struct sisusb_usb_data 
 	return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_getidxreg(struct sisusb_usb_data *sisusb, int port, u8 index, u8 *data)
 {
@@ -1355,9 +1349,6 @@ sisusb_getidxreg(struct sisusb_usb_data 
 	return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregandor(struct sisusb_usb_data *sisusb, int port, u8 idx,
 							u8 myand, u8 myor)
@@ -1387,18 +1378,12 @@ sisusb_setidxregmask(struct sisusb_usb_d
 	return ret;
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregor(struct sisusb_usb_data *sisusb, int port, u8 index, u8 myor)
 {
 	return(sisusb_setidxregandor(sisusb, port, index, 0xff, myor));
 }
 
-#ifndef INCL_SISUSB_CON
-static
-#endif
 int
 sisusb_setidxregand(struct sisusb_usb_data *sisusb, int port, u8 idx, u8 myand)
 {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/