Re: [PATCH 3/3] IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
On Mon, Feb 25, 2008 at 8:31 AM, Ingo Molnar [EMAIL PROTECTED] wrote: * Paolo Ciarrocchi [EMAIL PROTECTED] wrote: Before: total: 34 errors, 14 warnings, 456 lines checked After: total: 0 errors, 8 warnings, 456 lines checked sidenote: please also indicate to maintainers that the cleanup causes no change in generated code. Find below of how one of your cleanup patches looks like in its final form in x86.git. (i auto-generated all of the commit log) info like that makes it easier for maintainers to see the intended zero impact of your changes. Sure, I'll script that. Ciao, -- Paolo http://paolo.ciarrocchi.googlepages.com/ - To unsubscribe from this list: send the line unsubscribe linux-ide in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
Before:
total: 34 errors, 14 warnings, 456 lines checked
After:
total: 0 errors, 8 warnings, 456 lines checked
Signed-off-by: Paolo Ciarrocchi [EMAIL PROTECTED]
---
drivers/ide/pci/cy82c693.c | 74 ++--
1 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 833fa4d..08eab7e 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -6,7 +6,7 @@
*
* The CY82C693 chipset is used on Digital's PC-Alpha 164SX boards.
* Writing the driver was quite simple, since most of the job is
- * done by the generic pci-ide support.
+ * done by the generic pci-ide support.
* The hard part was finding the CY82C693's datasheet on Cypress's
* web page :-(. But Altavista solved this problem :-).
*
@@ -15,12 +15,12 @@
* - I recently got a 16.8G IBM DTTA, so I was able to test it with
* a large and fast disk - the results look great, so I'd say the
* driver is working fine :-)
- * hdparm -t reports 8.17 MB/sec at about 6% CPU usage for the DTTA
- * - this is my first linux driver, so there's probably a lot of room
+ * hdparm -t reports 8.17 MB/sec at about 6% CPU usage for the DTTA
+ * - this is my first linux driver, so there's probably a lot of room
* for optimizations and bug fixing, so feel free to do it.
* - use idebus=xx parameter to set PCI bus speed - needed to calc
* timings for PIO modes (default will be 40)
- * - if using PIO mode it's a good idea to set the PIO mode and
+ * - if using PIO mode it's a good idea to set the PIO mode and
* 32-bit I/O support (if possible), e.g. hdparm -p2 -c1 /dev/hda
* - I had some problems with my IBM DHEA with PIO modes 2
* (lost interrupts) ?
@@ -110,11 +110,11 @@ typedef struct pio_clocks_s {
* calc clocks using bus_speed
* returns (rounded up) time in bus clocks for time in ns
*/
-static int calc_clk (int time, int bus_speed)
+static int calc_clk(int time, int bus_speed)
{
int clocks;
- clocks = (time*bus_speed+999)/1000 -1;
+ clocks = (time*bus_speed+999)/1000 - 1;
if (clocks 0)
clocks = 0;
@@ -132,8 +132,8 @@ static int calc_clk (int time, int bus_speed)
* NOTE: for mode 0,1 and 2 drives 8-bit IDE command control registers are used
* for mode 3 and 4 drives 8 and 16-bit timings are the same
*
- */
-static void compute_clocks (u8 pio, pio_clocks_t *p_pclk)
+ */
+static void compute_clocks(u8 pio, pio_clocks_t *p_pclk)
{
int clk1, clk2;
int bus_speed = system_bus_clock(); /* get speed of PCI bus */
@@ -158,7 +158,7 @@ static void compute_clocks (u8 pio, pio_clocks_t *p_pclk)
clk1 = (clk14)|clk2; /* combine active and recovery clocks */
/* note: we use the same values for 16bit IOR and IOW
- * those are all the same, since I don't have other
+* those are all the same, since I don't have other
* timings than those from ide-lib.c
*/
@@ -186,7 +186,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const
u8 mode)
outb(index, CY82_INDEX_PORT);
data = inb(CY82_DATA_PORT);
- printk (KERN_INFO %s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n,
+ printk(KERN_INFO %s (ch=%d, dev=%d): DMA mode is %d (single=%d)\n,
drive-name, HWIF(drive)-channel, drive-select.b.unit,
(data0x3), ((data2)1));
#endif /* CY82C693_DEBUG_LOGS */
@@ -202,7 +202,7 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const
u8 mode)
mode 3, single);
#endif /* CY82C693_DEBUG_INFO */
- /*
+ /*
* note: below we set the value for Bus Master IDE TimeOut Register
* I'm not absolutly sure what this does, but it solved my problem
* with IDE DMA and sound, so I now can play sound and work with
@@ -216,8 +216,8 @@ static void cy82c693_set_dma_mode(ide_drive_t *drive, const
u8 mode)
outb(CY82_INDEX_TIMEOUT, CY82_INDEX_PORT);
outb(data, CY82_DATA_PORT);
-#if CY82C693_DEBUG_INFO
- printk (KERN_INFO %s: Set IDE Bus Master TimeOut Register to 0x%X\n,
+#if CY82C693_DEBUG_INFO
+ printk(KERN_INFO %s: Set IDE Bus Master TimeOut Register to 0x%X\n,
drive-name, data);
#endif /* CY82C693_DEBUG_INFO */
}
@@ -242,14 +242,14 @@ static void cy82c693_set_pio_mode(ide_drive_t *drive,
const u8 pio)
#if CY82C693_DEBUG_LOGS
/* for debug let's show the register values */
-
- if (drive-select.b.unit == 0) {
+
+ if (drive-select.b.unit == 0) {
/*
-* get master drive registers
+* get master drive registers
* address setup control register
* is 32 bit !!!
-*/
- pci_read_config_dword(dev, CY82_IDE_ADDRSETUP, addrCtrl);
+
Re: [PATCH 3/3] IDE: Coding Style fixes to drivers/ide/pci/cy82c693.c
* Paolo Ciarrocchi [EMAIL PROTECTED] wrote:
Before:
total: 34 errors, 14 warnings, 456 lines checked
After:
total: 0 errors, 8 warnings, 456 lines checked
sidenote: please also indicate to maintainers that the cleanup causes no
change in generated code. Find below of how one of your cleanup patches
looks like in its final form in x86.git. (i auto-generated all of the
commit log)
info like that makes it easier for maintainers to see the intended zero
impact of your changes.
Ingo
--
Subject: x86: coding style fixes to arch/x86/kernel/vm86_32.c
From: Paolo Ciarrocchi [EMAIL PROTECTED]
Date: Fri, 22 Feb 2008 23:10:40 +0100
Before:
total: 64 errors, 18 warnings, 840 lines checked
After:
total: 12 errors, 15 warnings, 844 lines checked
No code changed:
arch/x86/kernel/vm86_32.o:
textdata bss dec hex filename
4449 28 13246091201 vm86_32.o.before
4449 28 13246091201 vm86_32.o.after
md5:
e4e51ed7689d17f04148554a3c6d5bb6 vm86_32.o.before.asm
e4e51ed7689d17f04148554a3c6d5bb6 vm86_32.o.after.asm
Signed-off-by: Paolo Ciarrocchi [EMAIL PROTECTED]
Signed-off-by: Ingo Molnar [EMAIL PROTECTED]
---
arch/x86/kernel/vm86_32.c | 174 +++---
1 file changed, 89 insertions(+), 85 deletions(-)
Index: linux-x86.q/arch/x86/kernel/vm86_32.c
===
--- linux-x86.q.orig/arch/x86/kernel/vm86_32.c
+++ linux-x86.q/arch/x86/kernel/vm86_32.c
@@ -64,7 +64,7 @@
#define KVM86 ((struct kernel_vm86_struct *)regs)
-#define VMPI KVM86-vm86plus
+#define VMPI KVM86-vm86plus
/*
@@ -81,7 +81,7 @@
#define VFLAGS (*(unsigned short *)(current-thread.v86flags))
#define VEFLAGS(current-thread.v86flags)
-#define set_flags(X,new,mask) \
+#define set_flags(X, new, mask) \
((X) = ((X) ~(mask)) | ((new) (mask)))
#define SAFE_MASK (0xDD5)
@@ -93,8 +93,10 @@ static int copy_vm86_regs_to_user(struct
{
int ret = 0;
- /* kernel_vm86_regs is missing gs, so copy everything up to
- (but not including) orig_eax, and then rest including orig_eax. */
+ /*
+* kernel_vm86_regs is missing gs, so copy everything up to
+* (but not including) orig_eax, and then rest including orig_eax.
+*/
ret += copy_to_user(user, regs, offsetof(struct kernel_vm86_regs,
pt.orig_ax));
ret += copy_to_user(user-orig_eax, regs-pt.orig_ax,
sizeof(struct kernel_vm86_regs) -
@@ -120,7 +122,7 @@ static int copy_vm86_regs_from_user(stru
return ret;
}
-struct pt_regs * save_v86_state(struct kernel_vm86_regs * regs)
+struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
{
struct tss_struct *tss;
struct pt_regs *ret;
@@ -138,8 +140,8 @@ struct pt_regs * save_v86_state(struct k
do_exit(SIGSEGV);
}
set_flags(regs-pt.flags, VEFLAGS, VIF_MASK | current-thread.v86mask);
- tmp = copy_vm86_regs_to_user(current-thread.vm86_info-regs,regs);
- tmp +=
put_user(current-thread.screen_bitmap,current-thread.vm86_info-screen_bitmap);
+ tmp = copy_vm86_regs_to_user(current-thread.vm86_info-regs, regs);
+ tmp += put_user(current-thread.screen_bitmap,
current-thread.vm86_info-screen_bitmap);
if (tmp) {
printk(vm86: could not access userspace vm86_info\n);
do_exit(SIGSEGV);
@@ -237,20 +239,21 @@ asmlinkage int sys_vm86(struct pt_regs r
tsk = current;
switch (regs.bx) {
- case VM86_REQUEST_IRQ:
- case VM86_FREE_IRQ:
- case VM86_GET_IRQ_BITS:
- case VM86_GET_AND_RESET_IRQ:
- ret = do_vm86_irq_handling(regs.bx, (int)regs.cx);
- goto out;
- case VM86_PLUS_INSTALL_CHECK:
- /* NOTE: on old vm86 stuff this will return the error
- from access_ok(), because the subfunction is
- interpreted as (invalid) address to vm86_struct.
- So the installation check works.
-*/
- ret = 0;
- goto out;
+ case VM86_REQUEST_IRQ:
+ case VM86_FREE_IRQ:
+ case VM86_GET_IRQ_BITS:
+ case VM86_GET_AND_RESET_IRQ:
+ ret = do_vm86_irq_handling(regs.bx, (int)regs.cx);
+ goto out;
+ case VM86_PLUS_INSTALL_CHECK:
+ /*
+* NOTE: on old vm86 stuff this will return the error
+* from access_ok(), because the subfunction is
+* interpreted as (invalid) address to vm86_struct.
+* So the installation check works.
+*/
+ ret = 0;
+ goto out;
}
/* we come here only for functions VM86_ENTER,
