Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fea84f4 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: CodingStyle fixes 



Fix several CodingStyle issues in drivers/pcmcia/ . checkpatch.pl no longer
reports errors in the PCMCIA core. The remaining warnings mostly relate to
wrong indent -- PCMCIA historically used 4 spaces --, to lines over 80
characters and to hundreds of typedefs. The cleanup of those will follow
in the future.

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent e15c1c1f

drivers/pcmcia/cardbus.c

+12 −11
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ 
#include <linux/mm.h>

#include <linux/pci.h>

#include <linux/ioport.h>

#include <linux/io.h>

#include <asm/irq.h>

#include <asm/io.h>



#include <pcmcia/cs_types.h>

#include <pcmcia/ss.h>
@@ -127,7 +127,8 @@ static int cb_setup_cis_mem(struct pcmcia_socket * s, struct resource *res) 


=====================================================================*/



int read_cb_mem(struct pcmcia_socket * s, int space, u_int addr, u_int len, void *ptr)

int read_cb_mem(struct pcmcia_socket *s, int space, u_int addr, u_int len,

		void *ptr)

{

	struct pci_dev *dev;

	struct resource *res;
@@ -214,7 +215,7 @@ int __ref cb_alloc(struct pcmcia_socket * s) 
	unsigned int max, pass;



	s->functions = pci_scan_slot(bus, PCI_DEVFN(0, 0));

//	pcibios_fixup_bus(bus);

/*	pcibios_fixup_bus(bus); */



	max = bus->secondary;

	for (pass = 0; pass < 2; pass++)

drivers/pcmcia/cistpl.c

+107 −74
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/mm.h>

#include <linux/pci.h>

#include <linux/ioport.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/byteorder.h>

#include <asm/unaligned.h>
@@ -421,8 +421,6 @@ typedef struct tuple_flags { 
#define MFC_FN(f)	(((tuple_flags *)(&(f)))->mfc_fn)

#define SPACE(f)	(((tuple_flags *)(&(f)))->space)



int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int func, tuple_t *tuple);



int pccard_get_first_tuple(struct pcmcia_socket *s, unsigned int function, tuple_t *tuple)

{

    if (!s)
@@ -526,7 +524,8 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_ 


	/* End of chain?  Follow long link if possible */

	if (link[0] == CISTPL_END) {

	    if ((ofs = follow_link(s, tuple)) < 0)

	    ofs = follow_link(s, tuple);

	    if (ofs < 0)

		return -ENOSPC;

	    attr = SPACE(tuple->Flags);

	    read_cis_cache(s, attr, ofs, 2, link);
@@ -638,15 +637,26 @@ static int parse_device(tuple_t *tuple, cistpl_device_t *device) 
    device->ndev = 0;

    for (i = 0; i < CISTPL_MAX_DEVICES; i++) {



	if (*p == 0xff) break;

	if (*p == 0xff)

		break;

	device->dev[i].type = (*p >> 4);

	device->dev[i].wp = (*p & 0x08) ? 1 : 0;

	switch (*p & 0x07) {

	case 0: device->dev[i].speed = 0;   break;

	case 1: device->dev[i].speed = 250; break;

	case 2: device->dev[i].speed = 200; break;

	case 3: device->dev[i].speed = 150; break;

	case 4: device->dev[i].speed = 100; break;

	case 0:

		device->dev[i].speed = 0;

		break;

	case 1:

		device->dev[i].speed = 250;

		break;

	case 2:

		device->dev[i].speed = 200;

		break;

	case 3:

		device->dev[i].speed = 150;

		break;

	case 4:

		device->dev[i].speed = 100;

		break;

	case 7:

		if (++p == q)

			return -EINVAL;
@@ -737,11 +747,13 @@ static int parse_strings(u_char *p, u_char *q, int max, 
	ns++;

	for (;;) {

	    s[j++] = (*p == 0xff) ? '\0' : *p;

	    if ((*p == '\0') || (*p == 0xff)) break;

	    if ((*p == '\0') || (*p == 0xff))

		    break;

	    if (++p == q)

		    return -EINVAL;

	}

	if ((*p == 0xff) || (++p == q)) break;

	if ((*p == 0xff) || (++p == q))

		break;

    }

    if (found) {

	*found = ns;
@@ -793,7 +805,8 @@ static int parse_jedec(tuple_t *tuple, cistpl_jedec_t *jedec) 
    q = p + tuple->TupleDataLen;



    for (nid = 0; nid < CISTPL_MAX_DEVICES; nid++) {

	if (p > q-2) break;

	if (p > q-2)

		break;

	jedec->id[nid].mfr = p[0];

	jedec->id[nid].info = p[1];

	p += 2;
@@ -880,17 +893,20 @@ static u_char *parse_power(u_char *p, u_char *q, 
    int i;

    u_int scale;



    if (p == q) return NULL;

    if (p == q)

	    return NULL;

    pwr->present = *p;

    pwr->flags = 0;

    p++;

    for (i = 0; i < 7; i++)

	if (pwr->present & (1<<i)) {

	    if (p == q) return NULL;

	    if (p == q)

		    return NULL;

	    pwr->param[i] = POWER_CVT(*p);

	    scale = POWER_SCALE(*p);

	    while (*p & 0x80) {

		if (++p == q) return NULL;

		if (++p == q)

			return NULL;

		if ((*p & 0x7f) < 100)

		    pwr->param[i] += (*p & 0x7f) * scale / 100;

		else if (*p == 0x7d)
@@ -914,24 +930,28 @@ static u_char *parse_timing(u_char *p, u_char *q, 
{

    u_char scale;



    if (p == q) return NULL;

    if (p == q)

	    return NULL;

    scale = *p;

    if ((scale & 3) != 3) {

	if (++p == q) return NULL;

	if (++p == q)

		return NULL;

	timing->wait = SPEED_CVT(*p);

	timing->waitscale = exponent[scale & 3];

    } else

	timing->wait = 0;

    scale >>= 2;

    if ((scale & 7) != 7) {

	if (++p == q) return NULL;

	if (++p == q)

		return NULL;

	timing->ready = SPEED_CVT(*p);

	timing->rdyscale = exponent[scale & 7];

    } else

	timing->ready = 0;

    scale >>= 3;

    if (scale != 7) {

	if (++p == q) return NULL;

	if (++p == q)

		return NULL;

	timing->reserved = SPEED_CVT(*p);

	timing->rsvscale = exponent[scale];

    } else
@@ -946,7 +966,8 @@ static u_char *parse_io(u_char *p, u_char *q, cistpl_io_t *io) 
{

    int i, j, bsz, lsz;



    if (p == q) return NULL;

    if (p == q)

	    return NULL;

    io->flags = *p;



    if (!(*p & 0x80)) {
@@ -956,23 +977,28 @@ static u_char *parse_io(u_char *p, u_char *q, cistpl_io_t *io) 
	return p+1;

    }



    if (++p == q) return NULL;

    if (++p == q)

	    return NULL;

    io->nwin = (*p & 0x0f) + 1;

    bsz = (*p & 0x30) >> 4;

    if (bsz == 3) bsz++;

    if (bsz == 3)

	    bsz++;

    lsz = (*p & 0xc0) >> 6;

    if (lsz == 3) lsz++;

    if (lsz == 3)

	    lsz++;

    p++;



    for (i = 0; i < io->nwin; i++) {

	io->win[i].base = 0;

	io->win[i].len = 1;

	for (j = 0; j < bsz; j++, p++) {

	    if (p == q) return NULL;

	    if (p == q)

		    return NULL;

	    io->win[i].base += *p << (j*8);

	}

	for (j = 0; j < lsz; j++, p++) {

	    if (p == q) return NULL;

	    if (p == q)

		    return NULL;

	    io->win[i].len += *p << (j*8);

	}

    }
@@ -986,27 +1012,32 @@ static u_char *parse_mem(u_char *p, u_char *q, cistpl_mem_t *mem) 
    int i, j, asz, lsz, has_ha;

    u_int len, ca, ha;



    if (p == q) return NULL;

    if (p == q)

	    return NULL;



    mem->nwin = (*p & 0x07) + 1;

    lsz = (*p & 0x18) >> 3;

    asz = (*p & 0x60) >> 5;

    has_ha = (*p & 0x80);

    if (++p == q) return NULL;

    if (++p == q)

	    return NULL;



    for (i = 0; i < mem->nwin; i++) {

	len = ca = ha = 0;

	for (j = 0; j < lsz; j++, p++) {

	    if (p == q) return NULL;

	    if (p == q)

		    return NULL;

	    len += *p << (j*8);

	}

	for (j = 0; j < asz; j++, p++) {

	    if (p == q) return NULL;

	    if (p == q)

		    return NULL;

	    ca += *p << (j*8);

	}

	if (has_ha)

	    for (j = 0; j < asz; j++, p++) {

		if (p == q) return NULL;

		if (p == q)

			return NULL;

		ha += *p << (j*8);

	    }

	mem->win[i].len = len << 8;
@@ -1281,7 +1312,8 @@ static int parse_device_geo(tuple_t *tuple, cistpl_device_geo_t *geo) 
    q = p + tuple->TupleDataLen;



    for (n = 0; n < CISTPL_MAX_DEVICES; n++) {

	if (p > q-6) break;

	if (p > q-6)

		break;

	geo->geo[n].buswidth = p[0];

	geo->geo[n].erase_block = 1 << (p[1]-1);

	geo->geo[n].read_block  = 1 << (p[2]-1);
@@ -1332,7 +1364,8 @@ static int parse_org(tuple_t *tuple, cistpl_org_t *org) 
	    return -EINVAL;

    for (i = 0; i < 30; i++) {

	org->desc[i] = *p;

	if (*p == '\0') break;

	if (*p == '\0')

		break;

	if (++p == q)

		return -EINVAL;

    }

drivers/pcmcia/cs.c

+6 −6
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt) 
		put_device(&skt->dev);

		return NULL;

	}

	return (skt);

	return skt;

}

EXPORT_SYMBOL(pcmcia_get_socket);

drivers/pcmcia/ds.c

+34 −32
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int pcmcia_device_probe(struct device * dev) 
put_dev:

	if (ret)

		put_device(dev);

	return (ret);

	return ret;

}
@@ -630,7 +630,7 @@ static int pcmcia_card_add(struct pcmcia_socket *s) 
	for (i = 0; i < no_funcs; i++)

		pcmcia_device_add(s, i);



	return (ret);

	return ret;

}
@@ -756,7 +756,7 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 
 release:

	release_firmware(fw);



	return (ret);

	return ret;

}



#else /* !CONFIG_PCMCIA_LOAD_CIS */
@@ -865,7 +865,8 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, 
}





static int pcmcia_bus_match(struct device * dev, struct device_driver * drv) {

static int pcmcia_bus_match(struct device *dev, struct device_driver *drv)

{

	struct pcmcia_device *p_dev = to_pcmcia_dev(dev);

	struct pcmcia_driver *p_drv = to_pcmcia_drv(drv);

	struct pcmcia_device_id *did = p_drv->id_table;
@@ -1042,7 +1043,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 
	for (i = 0; i < 4; i++) {

		if (!p_dev->prod_id[i])

			continue;

		hash[i] = crc32(0,p_dev->prod_id[i],strlen(p_dev->prod_id[i]));

		hash[i] = crc32(0, p_dev->prod_id[i],

				strlen(p_dev->prod_id[i]));

	}

	return sprintf(buf, "pcmcia:m%04Xc%04Xf%02Xfn%02Xpfn%02X"

				"pa%08Xpb%08Xpc%08Xpd%08X\n",
@@ -1329,7 +1331,7 @@ static int __devinit pcmcia_bus_add_socket(struct device *dev, 
	if (ret) {

		dev_printk(KERN_ERR, dev, "PCMCIA registration failed\n");

		pcmcia_put_socket(socket);

		return (ret);

		return ret;

	}



	return 0;

drivers/pcmcia/pcmcia_ioctl.c

+25 −20
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ static struct pcmcia_driver *get_pcmcia_driver(dev_info_t *dev_info) 


	p_drv = container_of(drv, struct pcmcia_driver, drv);



	return (p_drv);

	return p_drv;

}





#ifdef CONFIG_PROC_FS

static struct proc_dir_entry *proc_pccard = NULL;

static struct proc_dir_entry *proc_pccard;



static int proc_read_drivers_callback(struct device_driver *driver, void *_m)

{
@@ -158,7 +158,8 @@ static int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) 


#else



static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj) {

static inline int adjust_irq(struct pcmcia_socket *s, adjust_t *adj)

{

	return 0;

}
@@ -215,7 +216,7 @@ static int pcmcia_adjust_resource_info(adjust_t *adj) 
	}

	up_read(&pcmcia_socket_list_rwsem);



	return (ret);

	return ret;

}
@@ -558,7 +559,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info) 
 err_put:

	pcmcia_put_socket(s);



	return (ret);

	return ret;

} /* bind_request */



#ifdef CONFIG_CARDBUS
@@ -655,7 +656,7 @@ static int get_device_info(struct pcmcia_socket *s, bind_info_t *bind_info, int 


 err_put:

	pcmcia_put_dev(p_dev);

	return (ret);

	return ret;

} /* get_device_info */
@@ -664,7 +665,7 @@ static int ds_open(struct inode *inode, struct file *file) 
    socket_t i = iminor(inode);

    struct pcmcia_socket *s;

    user_info_t *user;

    static int warning_printed = 0;

    static int warning_printed;

    int ret = 0;



    pr_debug("ds_open(socket %d)\n", i);
@@ -738,12 +739,13 @@ static int ds_release(struct inode *inode, struct file *file) 
    s = user->socket;



    /* Unlink user data structure */

    if ((file->f_flags & O_ACCMODE) != O_RDONLY) {

    if ((file->f_flags & O_ACCMODE) != O_RDONLY)

	s->pcmcia_state.busy = 0;

    }



    file->private_data = NULL;

    for (link = &s->user; *link; link = &(*link)->next)

	if (*link == user) break;

	if (*link == user)

		break;

    if (link == NULL)

	goto out;

    *link = user->next;
@@ -845,7 +847,8 @@ static int ds_ioctl(struct inode * inode, struct file * file, 
	return -EIO;



    size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;

    if (size > sizeof(ds_ioctl_arg_t)) return -EINVAL;

    if (size > sizeof(ds_ioctl_arg_t))

	return -EINVAL;



    /* Permission check */

    if (!(cmd & IOC_OUT) && !capable(CAP_SYS_ADMIN))
@@ -1045,7 +1048,8 @@ static const struct file_operations ds_fops = { 
	.poll		= ds_poll,

};



void __init pcmcia_setup_ioctl(void) {

void __init pcmcia_setup_ioctl(void)

{

	int i;



	/* Set up character device for user mode clients */
@@ -1064,7 +1068,8 @@ void __init pcmcia_setup_ioctl(void) { 
}





void __exit pcmcia_cleanup_ioctl(void) {

void __exit pcmcia_cleanup_ioctl(void)

{

#ifdef CONFIG_PROC_FS

	if (proc_pccard) {

		remove_proc_entry("drivers", proc_pccard);