PCMCIA/i82092: Fix style issues in i82092.c
v3 cover PCMCIA/i82092: Fix style issues in i82092.c
This patch series removes all style issues in i82092.c detected by checkpatch.pl.
Version 3 changes:
- patch 1: remove 'i82092aa' out of dev_<level> output
- patch 7: merge comments
- patch 9: remove enter/leave entirely
- changes in commit descriptions
Version 2 changes:
- merge whitespace patches into a single patch
- convert ?-operator to if statement (patch 7)
- rewrite commit messages
- add i82092 to subject
- modify enter/leave macro
Simon Geis (10):
PCMCIA/i82092: use dev_<level> instead of printk PCMCIA/i82092: add/remove spaces to improve readability PCMCIA/i82092: remove braces around single statement blocks PCMCIA/i82092: insert blank line after declarations PCMCIA/i82092: change code indentation PCMCIA/i82092: move assignment out of if condition PCMCIA/i82092: shorten the lines with over 80 characters PCMCIA/i82092: include <linux/io.h> instead of <asm/io.h> PCMCIA/i82092: delete enter/leave macro PCMCIA/i82092: remove #if 0 block
drivers/pcmcia/i82092.c | 639 ++++++++++++++++++-------------------- drivers/pcmcia/i82092aa.h | 11 - 2 files changed, 307 insertions(+), 343 deletions(-)
Signature · 1 line
2.20.1
PATCH v3 1/10 PCMCIA/i82092: use dev_<level> instead of printk
Improve the log output by using the
device-aware dev_err()/dev_info() functions. While at it, update one remaining printk(KERN_ERR ...) call to the preferred pr_err() call and delete commented out debugging lines.
--- drivers/pcmcia/i82092.c | 67 ++++++++++++++++++++++++----------------- 1 file changed, 39 insertions(+), 28 deletions(-)
drivers/pcmcia/i82092.c +39 -28
@@ -92,11 +92,13 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *ibreak ;default : -printk (KERN_ERR "i82092aa: Oops, you did something we didn't think of.\n" ); +dev_err (&dev->dev, +"Oops, you did something we didn't think of.\n" ); ret = -EIO ; goto err_out_disable; } -printk (KERN_INFO "i82092aa: configured as a %d socket device.\n" , socket_count); +dev_info (&dev->dev,"configured as a %d socket device.\n" , + socket_count);if (!request_region (pci_resource_start (dev,0 ),2 ,"i82092aa" )) { ret = -EBUSY ;
@@ -117,9 +119,9 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *iif (card_present (i)) { sockets[i].card_state =3 ; -dev_dbg (&dev->dev,"i82092aa: slot %i is occupied\n" , i); +dev_dbg (&dev->dev,"slot %i is occupied\n" , i); }else { -dev_dbg (&dev->dev,"i82092aa: slot %i is vacant\n" , i); +dev_dbg (&dev->dev,"slot %i is vacant\n" , i); } }
@@ -130,7 +132,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i/* Register the interrupt handler */ dev_dbg (&dev->dev,"Requesting interrupt %i\n" , dev->irq);if ((ret =request_irq (dev->irq, i82092aa_interrupt,IRQF_SHARED ,"i82092aa" , i82092aa_interrupt))) { -printk (KERN_ERR "i82092aa: Failed to register IRQ %d, aborting\n" , dev->irq); +dev_err (&dev->dev,"Failed to register IRQ %d, aborting\n" , + dev->irq); goto err_out_free_res; }
@@ -306,7 +309,7 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)while (1 ) { loopcount++;if (loopcount>20 ) { -printk (KERN_ERR "i82092aa: infinite eventloop in interrupt \n" ); +pr_err ("i82092aa: infinite eventloop in interrupt\n" );break ; }
@@ -326,7 +329,8 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)if (csc &I365_CSC_DETECT ) { events |=SS_DETECT ; -printk ("Card detected in socket %i!\n" ,i); +dev_info (&sockets[i].dev->dev, +"Card detected in socket %i!\n" , i); }if (indirect_read (i,I365_INTCTL ) &I365_PC_IOCARD ) {
@@ -417,7 +421,9 @@ static int i82092aa_init(struct pcmcia_socket *sock)static int i82092aa_get_status (struct pcmcia_socket *socket,u_int *value) { - unsigned int sock = container_of(socket, struct socket_info, socket)->number; + struct socket_info *sock_info = container_of(socket, struct socket_info, + socket); +unsigned int sock = sock_info->number;unsigned int status;enter ("i82092aa_get_status" );
@@ -458,7 +464,9 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)static int i82092aa_set_socket (struct pcmcia_socket *socket,socket_state_t *state) { - unsigned int sock = container_of(socket, struct socket_info, socket)->number; + struct socket_info *sock_info = container_of(socket, struct socket_info, + socket); +unsigned int sock = sock_info->number;unsigned char reg;enter ("i82092aa_set_socket" );
@@ -482,11 +490,11 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta reg =I365_PWR_NORESET ;/* default: disable resetdrv on resume */ if (state->flags &SS_PWR_AUTO ) { -printk ("Auto power\n" ); +dev_info (&sock_info->dev->dev,"Auto power\n" ); reg |=I365_PWR_AUTO ;/* automatic power mngmnt */ }if (state->flags &SS_OUTPUT_ENA ) { -printk ("Power Enabled \n" ); +dev_info (&sock_info->dev->dev,"Power Enabled\n" ); reg |=I365_PWR_OUT ;/* enable power */ }
@@ -494,11 +502,15 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *stacase 0 :break ;case 50 : -printk ("setting voltage to Vcc to 5V on socket %i\n" ,sock); +dev_info (&sock_info->dev->dev, +"setting voltage to Vcc to 5V on socket %i\n" , + sock); reg |=I365_VCC_5V ;break ;default : -printk ("i82092aa: i82092aa_set_socket called with invalid VCC power value: %i " , state->Vcc); +dev_err (&sock_info->dev->dev, +"%s called with invalid VCC power value: %i" , + __func__, state->Vcc);leave ("i82092aa_set_socket" );return -EINVAL ; }
@@ -506,18 +518,22 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *staswitch (state->Vpp) {case 0 : -printk ("not setting Vpp on socket %i\n" ,sock); +dev_info (&sock_info->dev->dev, +"not setting Vpp on socket %i\n" , sock);break ;case 50 : -printk ("setting Vpp to 5.0 for socket %i\n" ,sock); +dev_info (&sock_info->dev->dev, +"setting Vpp to 5.0 for socket %i\n" , sock); reg |=I365_VPP1_5V |I365_VPP2_5V ;break ;case 120 : -printk ("setting Vpp to 12.0\n" ); +dev_info (&sock_info->dev->dev,"setting Vpp to 12.0\n" ); reg |=I365_VPP1_12V |I365_VPP2_12V ;break ;default : -printk ("i82092aa: i82092aa_set_socket called with invalid VPP power value: %i " , state->Vcc); +dev_err (&sock_info->dev->dev, +"%s called with invalid VPP power value: %i" , + __func__, state->Vcc);leave ("i82092aa_set_socket" );return -EINVAL ; }
@@ -555,7 +571,9 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *stastatic int i82092aa_set_io_map (struct pcmcia_socket *socket,struct pccard_io_map *io) { - unsigned int sock = container_of(socket, struct socket_info, socket)->number; + struct socket_info *sock_info = container_of(socket, struct socket_info, + socket); +unsigned int sock = sock_info->number;unsigned char map, ioctl;enter ("i82092aa_set_io_map" );
@@ -576,8 +594,6 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_maif (indirect_read (sock,I365_ADDRWIN ) &I365_ENA_IO (map))indirect_resetbit (sock,I365_ADDRWIN ,I365_ENA_IO (map)); -/* printk("set_io_map: Setting range to %x - %x \n",io->start,io->stop); */ -/* write the new values */ indirect_write16 (sock,I365_IO (map)+I365_W_START ,io->start);indirect_write16 (sock,I365_IO (map)+I365_W_STOP ,io->stop);
@@ -619,7 +635,8 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_if ( (mem->card_start >0x3ffffff ) || (region.start > region.end) || (mem->speed >1000 ) ) {leave ("i82092aa_set_mem_map: invalid address / speed" ); - printk("invalid mem map for socket %i: %llx to %llx with a " + dev_err(&sock_info->dev->dev, + "invalid mem map for socket %i: %llx to %llx with a " "start of %x\n", sock, (unsigned long long)region.start,
@@ -633,8 +650,6 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_indirect_resetbit (sock,I365_ADDRWIN ,I365_ENA_MEM (map)); -/* printk("set_mem_map: Setting map %i range to %x - %x on socket %i, speed is %i, active = %i \n",map, region.start,region.end,sock,mem->speed,mem->flags & MAP_ACTIVE); */ -/* write the start address */ base =I365_MEM (map); i = (region.start >>12 ) &0x0fff ;
@@ -668,12 +683,8 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_ i = ((mem->card_start - region.start) >>12 ) &0x3fff ;if (mem->flags &MAP_WRPROT ) i |=I365_MEM_WRPROT ; -if (mem->flags &MAP_ATTRIB ) { -/* printk("requesting attribute memory for socket %i\n",sock);*/ +if (mem->flags &MAP_ATTRIB ) i |=I365_MEM_REG ; - }else { -/* printk("requesting normal memory for socket %i\n",sock);*/ - }indirect_write16 (sock,base+I365_W_OFF ,i);/* Enable the window if necessary */
Signature · 1 line
2.20.1
Re: [PATCH v3 01/10] PCMCIA/i82092: use dev_<level> instead of printk
Quoted 8 lines · Simon Geis
Improve the log output by using the
device-aware dev_err()/dev_info() functions. While at it, update one remainingprintk(KERN_ERR ...)call to the preferredpr_err()call and delete commented out debugging lines.Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, minus the one hunk which didn't serve any purpose:
drivers/pcmcia/i82092.c static int i82092aa_init(struct pcmcia_socket *sock) · line 429
Quoted 11 lines
drivers/pcmcia/i82092.c +3
-1@@ -417,7 +421,9 @@ static int i82092aa_init(struct pcmcia_socket *sock)static int i82092aa_get_status (struct pcmcia_socket *socket,u_int *value) { - unsigned int sock = container_of(socket, struct socket_info, socket)->number; + struct socket_info *sock_info = container_of(socket, struct socket_info, + socket); +unsigned int sock = sock_info->number;unsigned int status;enter ("i82092aa_get_status" );
Thanks,
Dominik
PATCH v3 2/10 PCMCIA/i82092: add/remove spaces to improve readability
In reply to Simon GeisImprove the readability by adding whitespaces after commas and around comparative operations. Also change indentation of one comment block.
While at it, remove trailing whitespaces and spaces before tabs.
--- drivers/pcmcia/i82092.c | 380 ++++++++++++++++++++-------------------- 1 file changed, 188 insertions(+), 192 deletions(-)
drivers/pcmcia/i82092.c +188 -192
@@ -1,5 +1,5 @@// SPDX-License-Identifier: GPL-2.0-only -/* +/* * Driver for Intel I82092AA PCI-PCMCIA bridge. * * (C) 2001 Red Hat, Inc.
@@ -42,7 +42,7 @@ static struct pci_driver i82092aa_pci_driver = {/* the pccard structure and its functions */ static struct pccard_operations i82092aa_operations = { - .init = i82092aa_init, + .init = i82092aa_init, .get_status = i82092aa_get_status, .set_socket = i82092aa_set_socket, .set_io_map = i82092aa_set_io_map,
@@ -53,33 +53,35 @@ static struct pccard_operations i82092aa_operations = {struct socket_info {int number; -int card_state;/* 0 = no socket, -1 = empty socket, -2 = card but not initialized, -3 = operational card */ -unsigned int io_base;/* base io address of the socket */ - +int card_state; +/* 0 = no socket, +* 1 = empty socket, +* 2 = card but not initialized, +* 3 = operational card +*/ +unsigned int io_base;/* base io address of the socket */ +struct pcmcia_socket socket;struct pci_dev *dev;/* The PCI device for the socket */ };#define MAX_SOCKETS 4static struct socket_info sockets[MAX_SOCKETS ]; -static int socket_count;/* shortcut */ +static int socket_count;/* shortcut */ static int i82092aa_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) {unsigned char configbyte;int i, ret; - +enter ("i82092aa_pci_probe" ); - +if ((ret =pci_enable_device (dev)))return ret; - +pci_read_config_byte (dev,0x40 , &configbyte);/* PCI Configuration Control */ -switch (configbyte&6 ) { +switch (configbyte&6 ) {case 0 : socket_count =2 ;break ;
@@ -90,7 +92,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *icase 6 : socket_count =4 ;break ; - +default :dev_err (&dev->dev,"Oops, you did something we didn't think of.\n" );
@@ -104,8 +106,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i ret = -EBUSY ; goto err_out_disable; } - -for (i =0 ;i<socket_count;i++) { + +for (i =0 ; i < socket_count; i++) { sockets[i].card_state =1 ;/* 1 = present but empty */ sockets[i].io_base =pci_resource_start (dev,0 ); sockets[i].socket.features |=SS_CAP_PCCARD ;
@@ -116,7 +118,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i sockets[i].socket.owner =THIS_MODULE ; sockets[i].number = i; - +if (card_present (i)) { sockets[i].card_state =3 ;dev_dbg (&dev->dev,"slot %i is occupied\n" , i);
@@ -124,7 +126,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *idev_dbg (&dev->dev,"slot %i is vacant\n" , i); } } - +/* Now, specifiy that all interrupts are to be done as PCI interrupts */ configbyte =0xFF ;/* bitmask, one bit per event, 1 = PCI interrupt, 0 = ISA interrupt */ pci_write_config_byte (dev,0x50 , configbyte);/* PCI Interrupt Routing Register */
@@ -137,7 +139,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i goto err_out_free_res; } -for (i =0 ; i<socket_count; i++) { +for (i =0 ; i < socket_count; i++) { sockets[i].socket.dev.parent = &dev->dev; sockets[i].socket.ops = &i82092aa_operations; sockets[i].socket.resource_ops = &pccard_nonstatic_ops;
@@ -152,7 +154,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i err_out_free_sockets:if (i) { -for (i--;i>=0 ;i--) { +for (i--; i >=0 ; i--) {pcmcia_unregister_socket (&sockets[i].socket); } }
@@ -161,7 +163,7 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *irelease_region (pci_resource_start (dev,0 ),2 ); err_out_disable:pci_disable_device (dev); -return ret; +return ret; }static void i82092aa_pci_remove (struct pci_dev *dev)
@@ -169,7 +171,7 @@ static void i82092aa_pci_remove(struct pci_dev *dev)int i;enter ("i82092aa_pci_remove" ); - +free_irq (dev->irq, i82092aa_interrupt);for (i =0 ; i < socket_count; i++)
@@ -187,12 +189,12 @@ static unsigned char indirect_read(int socket, unsigned short reg)unsigned short int port;unsigned char val;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg += socket *0x40 ; port = sockets[socket].io_base; -outb (reg,port); +outb (reg, port); val =inb (port+1 ); -spin_unlock_irqrestore (&port_lock,flags); +spin_unlock_irqrestore (&port_lock, flags);return val; }
@@ -202,15 +204,15 @@ static unsigned short indirect_read16(int socket, unsigned short reg)unsigned short int port;unsigned short tmp;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base; -outb (reg,port); +outb (reg, port); tmp =inb (port+1 ); reg++; -outb (reg,port); +outb (reg, port); tmp = tmp | (inb (port+1 )<<8 ); -spin_unlock_irqrestore (&port_lock,flags); +spin_unlock_irqrestore (&port_lock, flags); return tmp; }#endif
@@ -219,12 +221,12 @@ static void indirect_write(int socket, unsigned short reg, unsigned char value) {unsigned short int port;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; - port = sockets[socket].io_base; -outb (reg,port); -outb (value,port+1 ); -spin_unlock_irqrestore (&port_lock,flags); + port = sockets[socket].io_base; +outb (reg, port); +outb (value, port+1 ); +spin_unlock_irqrestore (&port_lock, flags); }static void indirect_setbit (int socket,unsigned short reg,unsigned char mask)
@@ -232,15 +234,15 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask)unsigned short int port;unsigned char val;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; - port = sockets[socket].io_base; -outb (reg,port); + port = sockets[socket].io_base; +outb (reg, port); val =inb (port+1 ); val |= mask; -outb (reg,port); -outb (val,port+1 ); -spin_unlock_irqrestore (&port_lock,flags); +outb (reg, port); +outb (val, port+1 ); +spin_unlock_irqrestore (&port_lock, flags); }
@@ -249,15 +251,15 @@ static void indirect_resetbit(int socket, unsigned short reg, unsigned char maskunsigned short int port;unsigned char val;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; - port = sockets[socket].io_base; -outb (reg,port); + port = sockets[socket].io_base; +outb (reg, port); val =inb (port+1 ); val &= ~mask; -outb (reg,port); -outb (val,port+1 ); -spin_unlock_irqrestore (&port_lock,flags); +outb (reg, port); +outb (val, port+1 ); +spin_unlock_irqrestore (&port_lock, flags); }static void indirect_write16 (int socket,unsigned short reg,unsigned short value)
@@ -265,20 +267,20 @@ static void indirect_write16(int socket, unsigned short reg, unsigned short valuunsigned short int port;unsigned char val;unsigned long flags; -spin_lock_irqsave (&port_lock,flags); +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; - port = sockets[socket].io_base; - -outb (reg,port); + port = sockets[socket].io_base; + +outb (reg, port); val = value &255 ; -outb (val,port+1 ); - +outb (val, port+1 ); + reg++; - -outb (reg,port); + +outb (reg, port); val = value>>8 ; -outb (val,port+1 ); -spin_unlock_irqrestore (&port_lock,flags); +outb (val, port+1 ); +spin_unlock_irqrestore (&port_lock, flags); }/* simple helper functions */
@@ -287,12 +289,12 @@ static int cycle_time = 120;static int to_cycles (int ns) { -if (cycle_time!=0 ) +if (cycle_time !=0 )return ns/cycle_time;else return 0 ; } - +/* Interrupt handler functionality */
@@ -302,56 +304,55 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)int loopcount =0 ;int handled =0 ; -unsigned int events, active=0 ; - +unsigned int events, active =0 ; +/* enter("i82092aa_interrupt");*/ - +while (1 ) { loopcount++; -if (loopcount>20 ) { +if (loopcount >20 ) {pr_err ("i82092aa: infinite eventloop in interrupt\n" );break ; } - + active =0 ; - -for (i=0 ;i<socket_count;i++) { + +for (i =0 ; i < socket_count; i++) {int csc; -if (sockets[i].card_state==0 )/* Inactive socket, should not happen */ +if (sockets[i].card_state ==0 )/* Inactive socket, should not happen */ +continue ; + + csc =indirect_read (i,I365_CSC );/* card status change register */ + +if (csc ==0 )/* no events on this socket */ continue ; - - csc =indirect_read (i,I365_CSC );/* card status change register */ - -if (csc==0 )/* no events on this socket */ -continue ; handled =1 ; events =0 ; - +if (csc &I365_CSC_DETECT ) { events |=SS_DETECT ;dev_info (&sockets[i].dev->dev,"Card detected in socket %i!\n" , i); - } - -if (indirect_read (i,I365_INTCTL ) &I365_PC_IOCARD ) { + } + +if (indirect_read (i,I365_INTCTL ) &I365_PC_IOCARD ) {/* For IO/CARDS, bit 0 means "read the card" */ - events |= (csc &I365_CSC_STSCHG ) ?SS_STSCHG :0 ; + events |= (csc &I365_CSC_STSCHG ) ?SS_STSCHG :0 ; }else {/* Check for battery/ready events */ events |= (csc &I365_CSC_BVD1 ) ?SS_BATDEAD :0 ; events |= (csc &I365_CSC_BVD2 ) ?SS_BATWARN :0 ; events |= (csc &I365_CSC_READY ) ?SS_READY :0 ; } - +if (events) {pcmcia_parse_events (&sockets[i].socket, events); } active |= events; } - -if (active==0 )/* no more events to handle */ -break ; - + +if (active ==0 )/* no more events to handle */ +break ; }return IRQ_RETVAL (handled);/* leave("i82092aa_interrupt");*/
@@ -362,22 +363,22 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)/* socket functions */ static int card_present (int socketno) -{ +{unsigned int val;enter ("card_present" ); - -if ((socketno<0 ) || (socketno >=MAX_SOCKETS )) + +if ((socketno <0 ) || (socketno >=MAX_SOCKETS ))return 0 ;if (sockets[socketno].io_base ==0 )return 0 ; - + val =indirect_read (socketno,1 );/* Interface status register */ -if ((val&12 )==12 ) { +if ((val&12 ) ==12 ) {leave ("card_present 1" );return 1 ; } - +leave ("card_present 0" );return 0 ; }
@@ -385,56 +386,53 @@ static int card_present(int socketno)static void set_bridge_state (int sock) {enter ("set_bridge_state" ); -indirect_write (sock,I365_GBLCTL ,0x00 ); -indirect_write (sock,I365_GENCTL ,0x00 ); - -indirect_setbit (sock,I365_INTCTL ,0x08 ); +indirect_write (sock,I365_GBLCTL ,0x00 ); +indirect_write (sock,I365_GENCTL ,0x00 ); + +indirect_setbit (sock,I365_INTCTL ,0x08 );leave ("set_bridge_state" ); } - - - -static int i82092aa_init (struct pcmcia_socket *sock) {int i;struct resource res = { .start =0 , .end =0x0fff }; -pccard_io_map io = {0 ,0 ,0 ,0 ,1 }; +pccard_io_map io = {0 ,0 ,0 ,0 ,1 };pccard_mem_map mem = { .res = &res, }; - -enter ("i82092aa_init" ); - -for (i =0 ; i <2 ; i++) { - io.map = i; -i82092aa_set_io_map (sock, &io); + +enter ("i82092aa_init" ); + +for (i =0 ; i <2 ; i++) { + io.map = i; +i82092aa_set_io_map (sock, &io); } -for (i =0 ; i <5 ; i++) { - mem.map = i; -i82092aa_set_mem_map (sock, &mem); +for (i =0 ; i <5 ; i++) { + mem.map = i; +i82092aa_set_mem_map (sock, &mem); } - +leave ("i82092aa_init" );return 0 ; } - + +static int i82092aa_get_status (struct pcmcia_socket *socket,u_int *value) { struct socket_info *sock_info = container_of(socket, struct socket_info, socket);unsigned int sock = sock_info->number;unsigned int status; - +enter ("i82092aa_get_status" ); - - status =indirect_read (sock,I365_STATUS );/* Interface Status Register */ + + status =indirect_read (sock,I365_STATUS );/* Interface Status Register */ *value =0 ; - +if ((status &I365_CS_DETECT ) ==I365_CS_DETECT ) { *value |=SS_DETECT ; } - +/* IO cards have a different meaning of bits 0,1 */ /* Also notice the inverse-logic on the bits */ if (indirect_read (sock,I365_INTCTL ) &I365_PC_IOCARD ) {
@@ -447,13 +445,13 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)if (!(status &I365_CS_BVD2 )) *value |=SS_BATWARN ; } - +if (status &I365_CS_WRPROT ) (*value) |=SS_WRPROT ;/* card is write protected */ - +if (status &I365_CS_READY ) (*value) |=SS_READY ;/* card is not busy */ - +if (status &I365_CS_POWERON ) (*value) |=SS_POWERON ;/* power is applied to the card */
@@ -462,33 +460,33 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) } -static int i82092aa_set_socket (struct pcmcia_socket *socket,socket_state_t *state) +static int i82092aa_set_socket (struct pcmcia_socket *socket,socket_state_t *state) { struct socket_info *sock_info = container_of(socket, struct socket_info, socket);unsigned int sock = sock_info->number;unsigned char reg; - +enter ("i82092aa_set_socket" ); - +/* First, set the global controller options */ - +set_bridge_state (sock); - +/* Values for the IGENC register */ - + reg =0 ; -if (!(state->flags &SS_RESET ))/* The reset bit has "inverse" logic */ - reg = reg |I365_PC_RESET ; -if (state->flags &SS_IOCARD ) +if (!(state->flags &SS_RESET ))/* The reset bit has "inverse" logic */ + reg = reg |I365_PC_RESET ; +if (state->flags &SS_IOCARD ) reg = reg |I365_PC_IOCARD ; - -indirect_write (sock,I365_INTCTL ,reg);/* IGENC, Interrupt and General Control Register */ - + +indirect_write (sock,I365_INTCTL , reg);/* IGENC, Interrupt and General Control Register */ +/* Power registers */ - + reg =I365_PWR_NORESET ;/* default: disable resetdrv on resume */ - +if (state->flags &SS_PWR_AUTO ) {dev_info (&sock_info->dev->dev,"Auto power\n" ); reg |=I365_PWR_AUTO ;/* automatic power mngmnt */
@@ -497,11 +495,11 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *stadev_info (&sock_info->dev->dev,"Power Enabled\n" ); reg |=I365_PWR_OUT ;/* enable power */ } - +switch (state->Vcc) { -case 0 : +case 0 :break ; -case 50 : +case 50 :dev_info (&sock_info->dev->dev,"setting voltage to Vcc to 5V on socket %i\n" , sock);
@@ -514,19 +512,18 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *staleave ("i82092aa_set_socket" );return -EINVAL ; } - - +switch (state->Vpp) { -case 0 : +case 0 :dev_info (&sock_info->dev->dev,"not setting Vpp on socket %i\n" , sock);break ; -case 50 : +case 50 :dev_info (&sock_info->dev->dev,"setting Vpp to 5.0 for socket %i\n" , sock); reg |=I365_VPP1_5V |I365_VPP2_5V ;break ; -case 120 : +case 120 :dev_info (&sock_info->dev->dev,"setting Vpp to 12.0\n" ); reg |=I365_VPP1_12V |I365_VPP2_12V ;break ;
@@ -537,12 +534,12 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *staleave ("i82092aa_set_socket" );return -EINVAL ; } - -if (reg !=indirect_read (sock,I365_POWER ))/* only write if changed */ -indirect_write (sock,I365_POWER ,reg); - + +if (reg !=indirect_read (sock,I365_POWER ))/* only write if changed */ +indirect_write (sock,I365_POWER , reg); +/* Enable specific interrupt events */ - + reg =0x00 ;if (state->csc_mask &SS_DETECT ) { reg |=I365_CSC_DETECT ;
@@ -551,19 +548,19 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *staif (state->csc_mask &SS_STSCHG ) reg |=I365_CSC_STSCHG ; }else { -if (state->csc_mask &SS_BATDEAD ) +if (state->csc_mask &SS_BATDEAD ) reg |=I365_CSC_BVD1 ; -if (state->csc_mask &SS_BATWARN ) +if (state->csc_mask &SS_BATWARN ) reg |=I365_CSC_BVD2 ; -if (state->csc_mask &SS_READY ) - reg |=I365_CSC_READY ; - +if (state->csc_mask &SS_READY ) + reg |=I365_CSC_READY ; + } - +/* now write the value and clear the (probably bogus) pending stuff by doing a dummy read*/ - -indirect_write (sock,I365_CSCINT ,reg); - (void )indirect_read (sock,I365_CSC ); + +indirect_write (sock,I365_CSCINT , reg); + (void )indirect_read (sock,I365_CSC );leave ("i82092aa_set_socket" );return 0 ;
@@ -575,41 +572,41 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_ma socket);unsigned int sock = sock_info->number;unsigned char map, ioctl; - +enter ("i82092aa_set_io_map" ); - + map = io->map; - -/* Check error conditions */ + +/* Check error conditions */ if (map >1 ) {leave ("i82092aa_set_io_map with invalid map" );return -EINVAL ; } -if ((io->start >0xffff ) || (io->stop >0xffff ) || (io->stop < io->start)){ +if ((io->start >0xffff ) || (io->stop >0xffff ) || (io->stop < io->start)) {leave ("i82092aa_set_io_map with invalid io" );return -EINVAL ; } -/* Turn off the window before changing anything */ +/* Turn off the window before changing anything */ if (indirect_read (sock,I365_ADDRWIN ) &I365_ENA_IO (map))indirect_resetbit (sock,I365_ADDRWIN ,I365_ENA_IO (map));/* write the new values */ -indirect_write16 (sock,I365_IO (map)+I365_W_START ,io->start); -indirect_write16 (sock,I365_IO (map)+I365_W_STOP ,io->stop); - - ioctl =indirect_read (sock,I365_IOCTL ) & ~I365_IOCTL_MASK (map); - +indirect_write16 (sock,I365_IO (map)+I365_W_START , io->start); +indirect_write16 (sock,I365_IO (map)+I365_W_STOP , io->stop); + + ioctl =indirect_read (sock,I365_IOCTL ) & ~I365_IOCTL_MASK (map); +if (io->flags & (MAP_16BIT |MAP_AUTOSZ )) ioctl |=I365_IOCTL_16BIT (map); - -indirect_write (sock,I365_IOCTL ,ioctl); - + +indirect_write (sock,I365_IOCTL , ioctl); +/* Turn the window back on if needed */ if (io->flags &MAP_ACTIVE ) -indirect_setbit (sock,I365_ADDRWIN ,I365_ENA_IO (map)); - -leave ("i82092aa_set_io_map" ); +indirect_setbit (sock,I365_ADDRWIN ,I365_ENA_IO (map)); + +leave ("i82092aa_set_io_map" );return 0 ; }
@@ -620,20 +617,20 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_struct pci_bus_region region;unsigned short base, i;unsigned char map; - +enter ("i82092aa_set_mem_map" );pcibios_resource_to_bus (sock_info->dev->bus, ®ion, mem->res); - + map = mem->map;if (map >4 ) {leave ("i82092aa_set_mem_map: invalid map" );return -EINVAL ; } - - -if ( (mem->card_start >0x3ffffff ) || (region.start > region.end) || - (mem->speed >1000 ) ) { + + +if ((mem->card_start >0x3ffffff ) || (region.start > region.end) || + (mem->speed >1000 )) {leave ("i82092aa_set_mem_map: invalid address / speed" );dev_err (&sock_info->dev->dev, "invalid mem map for socket %i: %llx to %llx with a "
@@ -644,24 +641,23 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_ mem->card_start);return -EINVAL ; } - +/* Turn off the window before changing anything */ if (indirect_read (sock,I365_ADDRWIN ) &I365_ENA_MEM (map)) -indirect_resetbit (sock,I365_ADDRWIN ,I365_ENA_MEM (map)); - - +indirect_resetbit (sock,I365_ADDRWIN ,I365_ENA_MEM (map)); +/* write the start address */ base =I365_MEM (map); i = (region.start >>12 ) &0x0fff ; -if (mem->flags &MAP_16BIT ) +if (mem->flags &MAP_16BIT ) i |=I365_MEM_16BIT ;if (mem->flags &MAP_0WS ) - i |=I365_MEM_0WS ; -indirect_write16 (sock,base+I365_W_START ,i); - + i |=I365_MEM_0WS ; +indirect_write16 (sock, base+I365_W_START , i); +/* write the stop address */ - - i= (region.end >>12 ) &0x0fff ; + + i = (region.end >>12 ) &0x0fff ;switch (to_cycles (mem->speed)) {case 0 :break ;
@@ -675,22 +671,22 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_ i |=I365_MEM_WS1 |I365_MEM_WS0 ;break ; } - -indirect_write16 (sock,base+I365_W_STOP ,i); - + +indirect_write16 (sock, base+I365_W_STOP , i); +/* card start */ - + i = ((mem->card_start - region.start) >>12 ) &0x3fff ;if (mem->flags &MAP_WRPROT ) i |=I365_MEM_WRPROT ;if (mem->flags &MAP_ATTRIB ) i |=I365_MEM_REG ; -indirect_write16 (sock,base+I365_W_OFF ,i); - +indirect_write16 (sock, base+I365_W_OFF , i); +/* Enable the window if necessary */ if (mem->flags &MAP_ACTIVE )indirect_setbit (sock,I365_ADDRWIN ,I365_ENA_MEM (map)); - +leave ("i82092aa_set_mem_map" );return 0 ; }
@@ -704,7 +700,7 @@ static void i82092aa_module_exit(void) {enter ("i82092aa_module_exit" );pci_unregister_driver (&i82092aa_pci_driver); -if (sockets[0 ].io_base>0 ) +if (sockets[0 ].io_base >0 )release_region (sockets[0 ].io_base,2 );leave ("i82092aa_module_exit" ); }
Signature · 1 line
2.20.1
Re: [PATCH v3 02/10] PCMCIA/i82092: add/remove spaces to improve readability
Quoted 8 lines · Simon Geis
Improve the readability by adding whitespaces after commas and around comparative operations. Also change indentation of one comment block.
While at it, remove trailing whitespaces and spaces before tabs.Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks.
Dominik
PATCH v3 3/10 PCMCIA/i82092: remove braces around single statement blocks
In reply to Simon GeisRemove braces around single statement blocks in order to improve readability.
--- drivers/pcmcia/i82092.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/pcmcia/i82092.c +5 -10
@@ -144,9 +144,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i sockets[i].socket.ops = &i82092aa_operations; sockets[i].socket.resource_ops = &pccard_nonstatic_ops; ret =pcmcia_register_socket (&sockets[i].socket); -if (ret) { +if (ret) goto err_out_free_sockets; - } }leave ("i82092aa_pci_probe" );
@@ -154,9 +153,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i err_out_free_sockets:if (i) { -for (i--; i >=0 ; i--) { +for (i--; i >=0 ; i--)pcmcia_unregister_socket (&sockets[i].socket); - } }free_irq (dev->irq, i82092aa_interrupt); err_out_free_res:
@@ -345,9 +343,8 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev) events |= (csc &I365_CSC_READY ) ?SS_READY :0 ; } -if (events) { +if (events)pcmcia_parse_events (&sockets[i].socket, events); - } active |= events; }
@@ -429,9 +426,8 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) status =indirect_read (sock,I365_STATUS );/* Interface Status Register */ *value =0 ; -if ((status &I365_CS_DETECT ) ==I365_CS_DETECT ) { +if ((status &I365_CS_DETECT ) ==I365_CS_DETECT ) *value |=SS_DETECT ; - }/* IO cards have a different meaning of bits 0,1 */ /* Also notice the inverse-logic on the bits */
@@ -541,9 +537,8 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta/* Enable specific interrupt events */ reg =0x00 ; -if (state->csc_mask &SS_DETECT ) { +if (state->csc_mask &SS_DETECT ) reg |=I365_CSC_DETECT ; - }if (state->flags &SS_IOCARD ) {if (state->csc_mask &SS_STSCHG ) reg |=I365_CSC_STSCHG ;
Signature · 1 line
2.20.1
Re: [PATCH v3 03/10] PCMCIA/i82092: remove braces around single statement blocks
Quoted 6 lines · Simon Geis
Remove braces around single statement blocks in order to improve readability.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks.
Dominik
PATCH v3 4/10 PCMCIA/i82092: insert blank line after declarations
In reply to Simon GeisImprove readability of the code by inserting a blank line after variable declarations.
--- drivers/pcmcia/i82092.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pcmcia/i82092.c +8 -0
@@ -187,6 +187,7 @@ static unsigned char indirect_read(int socket, unsigned short reg)unsigned short int port;unsigned char val;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg += socket *0x40 ; port = sockets[socket].io_base;
@@ -202,6 +203,7 @@ static unsigned short indirect_read16(int socket, unsigned short reg)unsigned short int port;unsigned short tmp;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base;
@@ -219,6 +221,7 @@ static void indirect_write(int socket, unsigned short reg, unsigned char value) {unsigned short int port;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base;
@@ -232,6 +235,7 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask)unsigned short int port;unsigned char val;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base;
@@ -249,6 +253,7 @@ static void indirect_resetbit(int socket, unsigned short reg, unsigned char maskunsigned short int port;unsigned char val;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base;
@@ -265,6 +270,7 @@ static void indirect_write16(int socket, unsigned short reg, unsigned short valuunsigned short int port;unsigned char val;unsigned long flags; +spin_lock_irqsave (&port_lock, flags); reg = reg + socket *0x40 ; port = sockets[socket].io_base;
@@ -317,6 +323,7 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)for (i =0 ; i < socket_count; i++) {int csc; +if (sockets[i].card_state ==0 )/* Inactive socket, should not happen */ continue ;
@@ -362,6 +369,7 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)static int card_present (int socketno) {unsigned int val; +enter ("card_present" );if ((socketno <0 ) || (socketno >=MAX_SOCKETS ))
Signature · 1 line
2.20.1
Re: [PATCH v3 04/10] PCMCIA/i82092: insert blank line after declarations
Quoted 6 lines · Simon Geis
Improve readability of the code by inserting a blank line after variable declarations.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks!
Dominik
PATCH v3 5/10 PCMCIA/i82092: change code indentation
In reply to Simon GeisAlign switch and case labels in order to improve readability. For the same reason, change the indentation of an if-statement.
--- drivers/pcmcia/i82092.c | 122 ++++++++++++++++++++-------------------- 1 file changed, 61 insertions(+), 61 deletions(-)
drivers/pcmcia/i82092.c +61 -61
@@ -82,22 +82,22 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *ipci_read_config_byte (dev,0x40 , &configbyte);/* PCI Configuration Control */ switch (configbyte&6 ) { -case 0 : - socket_count =2 ; -break ; -case 2 : - socket_count =1 ; -break ; -case 4 : -case 6 : - socket_count =4 ; -break ; - -default : -dev_err (&dev->dev, -"Oops, you did something we didn't think of.\n" ); - ret = -EIO ; - goto err_out_disable; +case 0 : + socket_count =2 ; +break ; +case 2 : + socket_count =1 ; +break ; +case 4 : +case 6 : + socket_count =4 ; +break ; + +default : +dev_err (&dev->dev, +"Oops, you did something we didn't think of.\n" ); + ret = -EIO ; + goto err_out_disable; }dev_info (&dev->dev,"configured as a %d socket device.\n" , socket_count);
@@ -501,42 +501,42 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta }switch (state->Vcc) { -case 0 : -break ; -case 50 : -dev_info (&sock_info->dev->dev, -"setting voltage to Vcc to 5V on socket %i\n" , - sock); - reg |=I365_VCC_5V ; -break ; -default : -dev_err (&sock_info->dev->dev, -"%s called with invalid VCC power value: %i" , - __func__, state->Vcc); -leave ("i82092aa_set_socket" ); -return -EINVAL ; +case 0 : +break ; +case 50 : +dev_info (&sock_info->dev->dev, +"setting voltage to Vcc to 5V on socket %i\n" , + sock); + reg |=I365_VCC_5V ; +break ; +default : +dev_err (&sock_info->dev->dev, +"%s called with invalid VCC power value: %i" , + __func__, state->Vcc); +leave ("i82092aa_set_socket" ); +return -EINVAL ; }switch (state->Vpp) { -case 0 : -dev_info (&sock_info->dev->dev, -"not setting Vpp on socket %i\n" , sock); -break ; -case 50 : -dev_info (&sock_info->dev->dev, -"setting Vpp to 5.0 for socket %i\n" , sock); - reg |=I365_VPP1_5V |I365_VPP2_5V ; -break ; -case 120 : -dev_info (&sock_info->dev->dev,"setting Vpp to 12.0\n" ); - reg |=I365_VPP1_12V |I365_VPP2_12V ; -break ; -default : -dev_err (&sock_info->dev->dev, -"%s called with invalid VPP power value: %i" , - __func__, state->Vcc); -leave ("i82092aa_set_socket" ); -return -EINVAL ; +case 0 : +dev_info (&sock_info->dev->dev, +"not setting Vpp on socket %i\n" , sock); +break ; +case 50 : +dev_info (&sock_info->dev->dev, +"setting Vpp to 5.0 for socket %i\n" , sock); + reg |=I365_VPP1_5V |I365_VPP2_5V ; +break ; +case 120 : +dev_info (&sock_info->dev->dev,"setting Vpp to 12.0\n" ); + reg |=I365_VPP1_12V |I365_VPP2_12V ; +break ; +default : +dev_err (&sock_info->dev->dev, +"%s called with invalid VPP power value: %i" , + __func__, state->Vcc); +leave ("i82092aa_set_socket" ); +return -EINVAL ; }if (reg !=indirect_read (sock,I365_POWER ))/* only write if changed */
@@ -662,17 +662,17 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_ i = (region.end >>12 ) &0x0fff ;switch (to_cycles (mem->speed)) { -case 0 : -break ; -case 1 : - i |=I365_MEM_WS0 ; -break ; -case 2 : - i |=I365_MEM_WS1 ; -break ; -default : - i |=I365_MEM_WS1 |I365_MEM_WS0 ; -break ; +case 0 : +break ; +case 1 : + i |=I365_MEM_WS0 ; +break ; +case 2 : + i |=I365_MEM_WS1 ; +break ; +default : + i |=I365_MEM_WS1 |I365_MEM_WS0 ; +break ; }indirect_write16 (sock, base+I365_W_STOP , i);
@@ -704,7 +704,7 @@ static void i82092aa_module_exit(void)enter ("i82092aa_module_exit" );pci_unregister_driver (&i82092aa_pci_driver);if (sockets[0 ].io_base >0 ) -release_region (sockets[0 ].io_base,2 ); +release_region (sockets[0 ].io_base,2 );leave ("i82092aa_module_exit" ); }
Signature · 1 line
2.20.1
Re: [PATCH v3 05/10] PCMCIA/i82092: change code indentation
Quoted 6 lines · Simon Geis
Align switch and case labels in order to improve readability. For the same reason, change the indentation of an if-statement.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks,
Dominik
PATCH v3 6/10 PCMCIA/i82092: move assignment out of if condition
In reply to Simon GeisImprove readability by moving the assignment out of if conditions.
--- drivers/pcmcia/i82092.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/pcmcia/i82092.c +5 -2
@@ -77,7 +77,8 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *ienter ("i82092aa_pci_probe" ); -if ((ret =pci_enable_device (dev))) + ret =pci_enable_device (dev); +if (ret)return ret;pci_read_config_byte (dev,0x40 , &configbyte);/* PCI Configuration Control */
@@ -133,7 +134,9 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i/* Register the interrupt handler */ dev_dbg (&dev->dev,"Requesting interrupt %i\n" , dev->irq); -if ((ret =request_irq (dev->irq, i82092aa_interrupt,IRQF_SHARED ,"i82092aa" , i82092aa_interrupt))) { + ret =request_irq (dev->irq, i82092aa_interrupt,IRQF_SHARED , +"i82092aa" , i82092aa_interrupt); +if (ret) {dev_err (&dev->dev,"Failed to register IRQ %d, aborting\n" , dev->irq); goto err_out_free_res;
Signature · 1 line
2.20.1
Re: [PATCH v3 06/10] PCMCIA/i82092: move assignment out of if condition
Quoted 5 lines · Simon Geis
Improve readability by moving the assignment out of if conditions.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks!
Dominik
PATCH v3 7/10 PCMCIA/i82092: shorten the lines with over 80 characters
In reply to Simon GeisSplit the lines with more than 80 characters in order to improve readability of the code.
--- drivers/pcmcia/i82092.c | 73 +++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 24 deletions(-)
drivers/pcmcia/i82092.c +49 -24
@@ -70,7 +70,8 @@ static struct socket_info sockets[MAX_SOCKETS];static int socket_count;/* shortcut */ -static int i82092aa_pci_probe (struct pci_dev *dev,const struct pci_device_id *id) +static int i82092aa_pci_probe (struct pci_dev *dev, +const struct pci_device_id *id) {unsigned char configbyte;int i, ret;
@@ -81,7 +82,9 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *iif (ret)return ret; -pci_read_config_byte (dev,0x40 , &configbyte);/* PCI Configuration Control */ +/* PCI Configuration Control */ +pci_read_config_byte (dev,0x40 , &configbyte); +switch (configbyte&6 ) {case 0 : socket_count =2 ;
@@ -128,9 +131,13 @@ static int i82092aa_pci_probe(struct pci_dev *dev, const struct pci_device_id *i } } -/* Now, specifiy that all interrupts are to be done as PCI interrupts */ - configbyte =0xFF ;/* bitmask, one bit per event, 1 = PCI interrupt, 0 = ISA interrupt */ -pci_write_config_byte (dev,0x50 , configbyte);/* PCI Interrupt Routing Register */ +/* Now, specifiy that all interrupts are to be done as PCI interrupts +* bitmask, one bit per event, 1 = PCI interrupt, 0 = ISA interrupt +*/ + configbyte =0xFF ; + +/* PCI Interrupt Routing Register */ +pci_write_config_byte (dev,0x50 , configbyte);/* Register the interrupt handler */ dev_dbg (&dev->dev,"Requesting interrupt %i\n" , dev->irq);
@@ -251,7 +258,8 @@ static void indirect_setbit(int socket, unsigned short reg, unsigned char mask) } -static void indirect_resetbit (int socket,unsigned short reg,unsigned char mask) +static void indirect_resetbit (int socket, +unsigned short reg,unsigned char mask) {unsigned short int port;unsigned char val;
@@ -268,7 +276,8 @@ static void indirect_resetbit(int socket, unsigned short reg, unsigned char maskspin_unlock_irqrestore (&port_lock, flags); } -static void indirect_write16 (int socket,unsigned short reg,unsigned short value) +static void indirect_write16 (int socket, +unsigned short reg,unsigned short value) {unsigned short int port;unsigned char val;
@@ -327,10 +336,12 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)for (i =0 ; i < socket_count; i++) {int csc; -if (sockets[i].card_state ==0 )/* Inactive socket, should not happen */ +/* Inactive socket, should not happen */ +if (sockets[i].card_state ==0 )continue ; - csc =indirect_read (i,I365_CSC );/* card status change register */ +/* card status change register */ + csc =indirect_read (i,I365_CSC );if (csc ==0 )/* no events on this socket */ continue ;
@@ -345,12 +356,16 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)if (indirect_read (i,I365_INTCTL ) &I365_PC_IOCARD ) {/* For IO/CARDS, bit 0 means "read the card" */ - events |= (csc &I365_CSC_STSCHG ) ?SS_STSCHG :0 ; +if (csc &I365_CSC_STSCHG ) + events |=SS_STSCHG ; }else {/* Check for battery/ready events */ - events |= (csc &I365_CSC_BVD1 ) ?SS_BATDEAD :0 ; - events |= (csc &I365_CSC_BVD2 ) ?SS_BATWARN :0 ; - events |= (csc &I365_CSC_READY ) ?SS_READY :0 ; +if (csc &I365_CSC_BVD1 ) + events |=SS_BATDEAD ; +if (csc &I365_CSC_BVD2 ) + events |=SS_BATWARN ; +if (csc &I365_CSC_READY ) + events |=SS_READY ; }if (events)
@@ -434,7 +449,8 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)enter ("i82092aa_get_status" ); - status =indirect_read (sock,I365_STATUS );/* Interface Status Register */ +/* Interface Status Register */ + status =indirect_read (sock,I365_STATUS ); *value =0 ;if ((status &I365_CS_DETECT ) ==I365_CS_DETECT )
@@ -467,7 +483,8 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value) } -static int i82092aa_set_socket (struct pcmcia_socket *socket,socket_state_t *state) +static int i82092aa_set_socket (struct pcmcia_socket *socket, +socket_state_t *state) { struct socket_info *sock_info = container_of(socket, struct socket_info, socket);
@@ -483,12 +500,15 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta/* Values for the IGENC register */ reg =0 ; -if (!(state->flags &SS_RESET ))/* The reset bit has "inverse" logic */ + +/* The reset bit has "inverse" logic */ +if (!(state->flags &SS_RESET )) reg = reg |I365_PC_RESET ;if (state->flags &SS_IOCARD ) reg = reg |I365_PC_IOCARD ; -indirect_write (sock,I365_INTCTL , reg);/* IGENC, Interrupt and General Control Register */ +/* IGENC, Interrupt and General Control Register */ +indirect_write (sock,I365_INTCTL , reg);/* Power registers */
@@ -563,7 +583,9 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *sta } -/* now write the value and clear the (probably bogus) pending stuff by doing a dummy read*/ +/* now write the value and clear the (probably bogus) pending stuff +* by doing a dummy read +*/ indirect_write (sock,I365_CSCINT , reg); (void )indirect_read (sock,I365_CSC );
@@ -572,7 +594,8 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket, socket_state_t *stareturn 0 ; } -static int i82092aa_set_io_map (struct pcmcia_socket *socket,struct pccard_io_map *io) +static int i82092aa_set_io_map (struct pcmcia_socket *socket, +struct pccard_io_map *io) { struct socket_info *sock_info = container_of(socket, struct socket_info, socket);
@@ -588,7 +611,8 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_maleave ("i82092aa_set_io_map with invalid map" );return -EINVAL ; } -if ((io->start >0xffff ) || (io->stop >0xffff ) || (io->stop < io->start)) { +if ((io->start >0xffff ) || (io->stop >0xffff ) + || (io->stop < io->start)) {leave ("i82092aa_set_io_map with invalid io" );return -EINVAL ; }
@@ -616,9 +640,11 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket, struct pccard_io_mareturn 0 ; } -static int i82092aa_set_mem_map (struct pcmcia_socket *socket,struct pccard_mem_map *mem) +static int i82092aa_set_mem_map (struct pcmcia_socket *socket, +struct pccard_mem_map *mem) { - struct socket_info *sock_info = container_of(socket, struct socket_info, socket); + struct socket_info *sock_info = container_of(socket, struct socket_info, + socket);unsigned int sock = sock_info->number;struct pci_bus_region region;unsigned short base, i;
@@ -639,8 +665,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_ (mem->speed > 1000)) {leave ("i82092aa_set_mem_map: invalid address / speed" ); dev_err(&sock_info->dev->dev, - "invalid mem map for socket %i: %llx to %llx with a " - "start of %x\n", + "invalid mem map for socket %i: %llx to %llx with a start of %x\n", sock, (unsigned long long)region.start, (unsigned long long)region.end,
Signature · 1 line
2.20.1
Re: [PATCH v3 07/10] PCMCIA/i82092: shorten the lines with over 80 characters
Quoted 6 lines · Simon Geis
Split the lines with more than 80 characters in order to improve readability of the code.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks.
Dominik
PATCH v3 8/10 PCMCIA/i82092: include <linux/io.h> instead of <asm/io.h>
In reply to Simon GeisInclude the more general linux/io.h instead of asm/io.h as checkpatch suggests.
--- drivers/pcmcia/i82092.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pcmcia/i82092.c +1 -1
@@ -18,7 +18,7 @@#include <pcmcia/ss.h> -#include <asm/io.h> +#include <linux/io.h> #include "i82092aa.h" #include "i82365.h"
Signature · 1 line
2.20.1
Re: [PATCH v3 08/10] PCMCIA/i82092: include <linux/io.h> instead of <asm/io.h>
Quoted 6 lines · Simon Geis
Include the more general
linux/io.hinstead ofasm/io.has checkpatch suggests.Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks
Dominik
PATCH v3 9/10 PCMCIA/i82092: delete enter/leave macro
In reply to Simon GeisRemove the enter/leave macros and the corresponding calls. These are obsolete since ftrace is available.
--- drivers/pcmcia/i82092.c | 53 ++++----------------------------------- drivers/pcmcia/i82092aa.h | 11 -------- 2 files changed, 5 insertions(+), 59 deletions(-)
drivers/pcmcia/i82092.c +5 -48
@@ -76,8 +76,6 @@ static int i82092aa_pci_probe(struct pci_dev *dev,unsigned char configbyte;int i, ret; -enter ("i82092aa_pci_probe" ); - ret =pci_enable_device (dev);if (ret)return ret;
@@ -158,7 +156,6 @@ static int i82092aa_pci_probe(struct pci_dev *dev, goto err_out_free_sockets; } -leave ("i82092aa_pci_probe" );return 0 ; err_out_free_sockets:
@@ -178,14 +175,10 @@ static void i82092aa_pci_remove(struct pci_dev *dev) {int i; -enter ("i82092aa_pci_remove" ); -free_irq (dev->irq, i82092aa_interrupt);for (i =0 ; i < socket_count; i++)pcmcia_unregister_socket (&sockets[i].socket); - -leave ("i82092aa_pci_remove" ); }static DEFINE_SPINLOCK (port_lock);
@@ -322,8 +315,6 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)unsigned int events, active =0 ; -/* enter("i82092aa_interrupt");*/ -while (1 ) { loopcount++;if (loopcount >20 ) {
@@ -377,7 +368,6 @@ static irqreturn_t i82092aa_interrupt(int irq, void *dev)break ; }return IRQ_RETVAL (handled); -/* leave("i82092aa_interrupt");*/ }
@@ -388,8 +378,6 @@ static int card_present(int socketno) {unsigned int val; -enter ("card_present" ); -if ((socketno <0 ) || (socketno >=MAX_SOCKETS ))return 0 ;if (sockets[socketno].io_base ==0 )
@@ -397,23 +385,18 @@ static int card_present(int socketno) val =indirect_read (socketno,1 );/* Interface status register */ -if ((val&12 ) ==12 ) { -leave ("card_present 1" ); +if ((val&12 ) ==12 )return 1 ; - } -leave ("card_present 0" );return 0 ; }static void set_bridge_state (int sock) { -enter ("set_bridge_state" );indirect_write (sock,I365_GBLCTL ,0x00 );indirect_write (sock,I365_GENCTL ,0x00 );indirect_setbit (sock,I365_INTCTL ,0x08 ); -leave ("set_bridge_state" ); }
@@ -424,8 +407,6 @@ static int i82092aa_init(struct pcmcia_socket *sock)pccard_io_map io = {0 ,0 ,0 ,0 ,1 };pccard_mem_map mem = { .res = &res, }; -enter ("i82092aa_init" ); -for (i =0 ; i <2 ; i++) { io.map = i;i82092aa_set_io_map (sock, &io);
@@ -435,7 +416,6 @@ static int i82092aa_init(struct pcmcia_socket *sock)i82092aa_set_mem_map (sock, &mem); } -leave ("i82092aa_init" );return 0 ; }
@@ -447,8 +427,6 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)unsigned int sock = sock_info->number;unsigned int status; -enter ("i82092aa_get_status" ); -/* Interface Status Register */ status =indirect_read (sock,I365_STATUS ); *value =0 ;
@@ -478,7 +456,6 @@ static int i82092aa_get_status(struct pcmcia_socket *socket, u_int *value)if (status &I365_CS_POWERON ) (*value) |=SS_POWERON ;/* power is applied to the card */ -leave ("i82092aa_get_status" );return 0 ; }
@@ -491,8 +468,6 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket,unsigned int sock = sock_info->number;unsigned char reg; -enter ("i82092aa_set_socket" ); -/* First, set the global controller options */ set_bridge_state (sock);
@@ -536,7 +511,6 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket,dev_err (&sock_info->dev->dev,"%s called with invalid VCC power value: %i" , __func__, state->Vcc); -leave ("i82092aa_set_socket" );return -EINVAL ; }
@@ -558,7 +532,6 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket,dev_err (&sock_info->dev->dev,"%s called with invalid VPP power value: %i" , __func__, state->Vcc); -leave ("i82092aa_set_socket" );return -EINVAL ; }
@@ -590,7 +563,6 @@ static int i82092aa_set_socket(struct pcmcia_socket *socket,indirect_write (sock,I365_CSCINT , reg); (void )indirect_read (sock,I365_CSC ); -leave ("i82092aa_set_socket" );return 0 ; }
@@ -602,20 +574,15 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket,unsigned int sock = sock_info->number;unsigned char map, ioctl; -enter ("i82092aa_set_io_map" ); - map = io->map;/* Check error conditions */ -if (map >1 ) { -leave ("i82092aa_set_io_map with invalid map" ); +if (map >1 )return -EINVAL ; - } +if ((io->start >0xffff ) || (io->stop >0xffff ) - || (io->stop < io->start)) { -leave ("i82092aa_set_io_map with invalid io" ); + || (io->stop < io->start))return -EINVAL ; - }/* Turn off the window before changing anything */ if (indirect_read (sock,I365_ADDRWIN ) &I365_ENA_IO (map))
@@ -636,7 +603,6 @@ static int i82092aa_set_io_map(struct pcmcia_socket *socket,if (io->flags &MAP_ACTIVE )indirect_setbit (sock,I365_ADDRWIN ,I365_ENA_IO (map)); -leave ("i82092aa_set_io_map" );return 0 ; }
@@ -650,20 +616,14 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket,unsigned short base, i;unsigned char map; -enter ("i82092aa_set_mem_map" ); -pcibios_resource_to_bus (sock_info->dev->bus, ®ion, mem->res); map = mem->map; -if (map >4 ) { -leave ("i82092aa_set_mem_map: invalid map" ); +if (map >4 )return -EINVAL ; - } -if ((mem->card_start >0x3ffffff ) || (region.start > region.end) || (mem->speed >1000 )) { -leave ("i82092aa_set_mem_map: invalid address / speed" ); dev_err(&sock_info->dev->dev, "invalid mem map for socket %i: %llx to %llx with a start of %x\n", sock,
@@ -718,7 +678,6 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket,if (mem->flags &MAP_ACTIVE )indirect_setbit (sock,I365_ADDRWIN ,I365_ENA_MEM (map)); -leave ("i82092aa_set_mem_map" );return 0 ; }
@@ -729,11 +688,9 @@ static int i82092aa_module_init(void)static void i82092aa_module_exit (void ) { -enter ("i82092aa_module_exit" );pci_unregister_driver (&i82092aa_pci_driver);if (sockets[0 ].io_base >0 )release_region (sockets[0 ].io_base,2 ); -leave ("i82092aa_module_exit" ); }module_init (i82092aa_module_init);
drivers/pcmcia/i82092aa.h +0 -11
@@ -4,17 +4,6 @@#include <linux/interrupt.h> -/* Debuging defines */ -#ifdef NOTRACE -#define enter (x) printk("Enter: %s, %s line %i\n",x,__FILE__,__LINE__) -#define leave (x) printk("Leave: %s, %s line %i\n",x,__FILE__,__LINE__) -#else -#define enter (x) do {} while (0) -#define leave (x) do {} while (0) -#endif - - -/* prototypes */ static int i82092aa_pci_probe (struct pci_dev *dev,const struct pci_device_id *id);
Signature · 1 line
2.20.1
Re: [PATCH v3 09/10] PCMCIA/i82092: delete enter/leave macro
Quoted 6 lines · Simon Geis
Remove the enter/leave macros and the corresponding calls. These are obsolete since ftrace is available.
Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks.
Dominik
PATCH v3 10/10 PCMCIA/i82092: remove #if 0 block
In reply to Simon GeisRemove the unused function indirect_read16, which is similar to indirect_read with the exception that it reads 16 instead of 8 bit.
--- drivers/pcmcia/i82092.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/pcmcia/i82092.c +0 -20
@@ -200,26 +200,6 @@ static unsigned char indirect_read(int socket, unsigned short reg)return val; } -#if 0 -static unsigned short indirect_read16 (int socket,unsigned short reg) -{ -unsigned short int port; -unsigned short tmp; -unsigned long flags; - -spin_lock_irqsave (&port_lock, flags); - reg = reg + socket *0x40 ; - port = sockets[socket].io_base; -outb (reg, port); - tmp =inb (port+1 ); - reg++; -outb (reg, port); - tmp = tmp | (inb (port+1 )<<8 ); -spin_unlock_irqrestore (&port_lock, flags); -return tmp; -} -#endif -static void indirect_write (int socket,unsigned short reg,unsigned char value) {unsigned short int port;
Signature · 1 line
2.20.1
Re: [PATCH v3 10/10] PCMCIA/i82092: remove #if 0 block
Quoted 7 lines · Simon Geis
Remove the unused function
indirect_read16, which is similar toindirect_readwith the exception that it reads 16 instead of 8 bit.Co-developed-by Lukas Panzer <[email protected]>Signed-off-by Lukas Panzer <[email protected]>Signed-off-by Simon Geis <[email protected]>
Applied, thanks.
Dominik
Dominik Brodowski
maintainerQuoted 2 lines · Simon Geis
This patch series removes all style issues in
i82092.cdetected by checkpatch.pl.
Thanks, the whole series is now in pcmcia-next, see
https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git/log/?h=pcmcia-next
Dominik