remove unneeded indentation in drivers/char/watchdog/i8xx_tco.c
PATCH 1/1 remove unneeded indentation in drivers/char/watchdog/i8xx_tco.c
Hi,
this patch changes a bit of indentation. Currently it is
if (i8xx_tcp_pci) {
...
return 1; }
return 0;
Now it will be
if (!i8xx_tcp_pci)
return 0;
...
return 1;
Also some superfluous spaces are killed to match Codingstyle.
drivers/char/watchdog/i8xx_tco.c +38 -38
@@ -391,7 +391,7 @@ MODULE_DEVICE_TABLE (pci, i8xx_tco_pci_t* Init & exit routines */ -static unsigned char __init i8xx_tco_getdevice (void ) +static unsigned char __init i8xx_tco_getdevice (void ) {struct pci_dev *dev =NULL ;u8 val1, val2;
@@ -407,47 +407,47 @@ static unsigned char __init i8xx_tco_get } } -if (i8xx_tco_pci) { -/* -* Find the ACPI base I/O address which is the base -* for the TCO registers (TCOBASE=ACPIBASE + 0x60) -* ACPIBASE is bits [15:7] from 0x40-0x43 -*/ -pci_read_config_byte (i8xx_tco_pci,0x40 , &val1); -pci_read_config_byte (i8xx_tco_pci,0x41 , &val2); - badr = ((val2 <<1 ) | (val1 >>7 )) <<7 ; -ACPIBASE = badr; -/* Something's wrong here, ACPIBASE has to be set */ -if (badr ==0x0001 || badr ==0x0000 ) { - printk (KERN_ERR PFX "failed to get TCOBASE address\n"); -return 0 ; - } -/* -* Check chipset's NO_REBOOT bit -*/ +if (!i8xx_tco_pci) +return 0 ; + +/* +* Find the ACPI base I/O address which is the base +* for the TCO registers (TCOBASE=ACPIBASE + 0x60) +* ACPIBASE is bits [15:7] from 0x40-0x43 +*/ +pci_read_config_byte (i8xx_tco_pci,0x40 , &val1); +pci_read_config_byte (i8xx_tco_pci,0x41 , &val2); + badr = ((val2 <<1 ) | (val1 >>7 )) <<7 ; +ACPIBASE = badr; +/* Something's wrong here, ACPIBASE has to be set */ +if (badr ==0x0001 || badr ==0x0000 ) { + printk(KERN_ERR PFX "failed to get TCOBASE address\n"); +return 0 ; + } +/* +* Check chipset's NO_REBOOT bit +*/ +pci_read_config_byte (i8xx_tco_pci,0xd4 , &val1); +if (val1 &0x02 ) { + val1 &=0xfd ; +pci_write_config_byte (i8xx_tco_pci,0xd4 , val1);pci_read_config_byte (i8xx_tco_pci,0xd4 , &val1);if (val1 &0x02 ) { - val1 &=0xfd ; -pci_write_config_byte (i8xx_tco_pci,0xd4 , val1); -pci_read_config_byte (i8xx_tco_pci,0xd4 , &val1); -if (val1 &0x02 ) { - printk (KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); -return 0 ;/* Cannot reset NO_REBOOT bit */ - } - } -/* Set the TCO_EN bit in SMI_EN register */ -if (!request_region (SMI_EN +1 ,1 ,"i8xx TCO" )) { - printk (KERN_ERR PFX "I/O address 0x%04x already in use\n", - SMI_EN + 1); -return 0 ; + printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, reboot disabled by hardware\n"); +return 0 ;/* Cannot reset NO_REBOOT bit */ } - val1 =inb (SMI_EN +1 ); - val1 &=0xdf ; -outb (val1,SMI_EN +1 ); -release_region (SMI_EN +1 ,1 ); -return 1 ; } -return 0 ; +/* Set the TCO_EN bit in SMI_EN register */ +if (!request_region (SMI_EN +1 ,1 ,"i8xx TCO" )) { + printk(KERN_ERR PFX "I/O address 0x%04x already in use\n", + SMI_EN + 1); +return 0 ; + } + val1 =inb (SMI_EN +1 ); + val1 &=0xdf ; +outb (val1,SMI_EN +1 ); +release_region (SMI_EN +1 ,1 ); +return 1 ; }static int __init watchdog_init (void )
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 1 line · Rolf Eike Beer
Hi,
hi!
Quoted 7 lines
this patch changes a bit of indentation. Currently it is if (
i8xx_tcp_pci) {
.....return 1; }return 0;
Quoted 8 lines
Now it will be
if (!i8xx_tcp_pci)
return 0;.....
return 1;Also some superfluous spaces are killed to match Codingstyle
Don't know who added those strange things ;)
But looks OK to me to change it this way.
So please go ahead and forward this patch.
Many thanks!
nils
- --
kernel concepts Tel: +49-271-771091-12
Dreisbachstr. 24 Fax: +49-271-771091-19
D-57250 Netphen Mob: +49-176-21024535
- --
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org
iD8DBQFC34x7JXeIURG1qHgRAs8HAKCHYD34TC3eDTGMQUnj4yrYM735bwCgkOAq 8kJdpgtczkWQd+MA+t7MxA0=
=JDJC
-----END PGP SIGNATURE-----
Quoted 10 lines · Nils Faerber
Quoted 3 lines · Rolf Eike Beer
this patch changes a bit of indentation. Currently it is [...]
Also some superfluous spaces are killed to match CodingstyleDon't know who added those strange things ;)
But looks OK to me to change it this way.So please go ahead and forward this patch.
In this case add a Signed-off-by.
Eike