When I submitted the last patchset for the 2.5 kernel series,

Alan Cox reformatted the code to follow his coding style when
he fixed the merge bugs.

This patch now introduces these coding style changes, so
that we don't wipe out his changes with the next patchset.

1 files changed, 7 insertions, 14 deletions

diff --git a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
index 984e089ce..6966f8542 100644
--- a/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
+++ b/linux/drivers/media/dvb/frontends/dvb_dummy_fe.c
@@ -30,8 +30,7 @@ static int sct = 0;
 /* depending on module parameter sct deliver different infos
  */
 
-static
-struct dvb_frontend_info dvb_s_dummyfe_info = {
+static struct dvb_frontend_info dvb_s_dummyfe_info = {
 	.name 			= "DVB-S dummy frontend",
 	.type 			= FE_QPSK,
 	.frequency_min 		= 950000,
@@ -48,8 +47,7 @@ struct dvb_frontend_info dvb_s_dummyfe_info = {
 	FE_CAN_QPSK
 };
 
-static
-struct dvb_frontend_info dvb_c_dummyfe_info = {
+static struct dvb_frontend_info dvb_c_dummyfe_info = {
 	.name			= "DVB-C dummy frontend",
 	.type 			= FE_QAM,
 	.frequency_stepsize	= 62500,
@@ -103,8 +101,7 @@ struct dvb_frontend_info *frontend_info(void)
 }
 
 
-static
-int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
+static int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 {
         switch (cmd) {
         case FE_GET_INFO:
@@ -176,23 +173,20 @@ int dvbdummyfe_ioctl (struct dvb_frontend *fe, unsigned int cmd, void *arg)
 } 
 
 
-static
-int dvbdummyfe_attach (struct dvb_i2c_bus *i2c)
+static int dvbdummyfe_attach (struct dvb_i2c_bus *i2c)
 {
 	dvb_register_frontend (dvbdummyfe_ioctl, i2c, NULL, frontend_info());
 	return 0;
 }
 
 
-static
-void dvbdummyfe_detach (struct dvb_i2c_bus *i2c)
+static void dvbdummyfe_detach (struct dvb_i2c_bus *i2c)
 {
 	dvb_unregister_frontend (dvbdummyfe_ioctl, i2c);
 }
 
 
-static
-int __init init_dvbdummyfe (void)
+static int __init init_dvbdummyfe (void)
 {
 	return dvb_register_i2c_device (THIS_MODULE,
 					dvbdummyfe_attach, 
@@ -201,8 +195,7 @@ int __init init_dvbdummyfe (void)
 }
 
 
-static 
-void __exit exit_dvbdummyfe (void)
+static void __exit exit_dvbdummyfe (void)
 {
 	dvb_unregister_i2c_device (dvbdummyfe_attach);
 	return;