mirror of
https://github.com/adulau/aha.git
synced 2025-01-14 12:03:33 +00:00
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: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Dominik Brodowski
parent
e15c1c1f3f
commit
9fea84f46a
14 changed files with 481 additions and 383 deletions
|
|
@ -64,7 +64,7 @@ config PCMCIA_IOCTL
|
|||
If unsure, say Y.
|
||||
|
||||
config CARDBUS
|
||||
bool "32-bit CardBus support"
|
||||
bool "32-bit CardBus support"
|
||||
depends on PCI
|
||||
default y
|
||||
---help---
|
||||
|
|
@ -87,8 +87,8 @@ config YENTA
|
|||
select PCCARD_NONSTATIC
|
||||
---help---
|
||||
This option enables support for CardBus host bridges. Virtually
|
||||
all modern PCMCIA bridges are CardBus compatible. A "bridge" is
|
||||
the hardware inside your computer that PCMCIA cards are plugged
|
||||
all modern PCMCIA bridges are CardBus compatible. A "bridge" is
|
||||
the hardware inside your computer that PCMCIA cards are plugged
|
||||
into.
|
||||
|
||||
To compile this driver as modules, choose M here: the
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
image number and an offset within that image. xlate_rom_addr()
|
||||
converts an image/offset address to an absolute offset from the
|
||||
ROM's base address.
|
||||
|
||||
|
||||
=====================================================================*/
|
||||
|
||||
static u_int xlate_rom_addr(void __iomem *b, u_int addr)
|
||||
|
|
@ -85,10 +85,10 @@ static u_int xlate_rom_addr(void __iomem *b, u_int addr)
|
|||
These are similar to setup_cis_mem and release_cis_mem for 16-bit
|
||||
cards. The "result" that is used externally is the cb_cis_virt
|
||||
pointer in the struct pcmcia_socket structure.
|
||||
|
||||
|
||||
=====================================================================*/
|
||||
|
||||
static void cb_release_cis_mem(struct pcmcia_socket * s)
|
||||
static void cb_release_cis_mem(struct pcmcia_socket *s)
|
||||
{
|
||||
if (s->cb_cis_virt) {
|
||||
dev_dbg(&s->dev, "cb_release_cis_mem()\n");
|
||||
|
|
@ -98,7 +98,7 @@ static void cb_release_cis_mem(struct pcmcia_socket * s)
|
|||
}
|
||||
}
|
||||
|
||||
static int cb_setup_cis_mem(struct pcmcia_socket * s, struct resource *res)
|
||||
static int cb_setup_cis_mem(struct pcmcia_socket *s, struct resource *res)
|
||||
{
|
||||
unsigned int start, size;
|
||||
|
||||
|
|
@ -124,10 +124,11 @@ static int cb_setup_cis_mem(struct pcmcia_socket * s, struct resource *res)
|
|||
|
||||
This is used by the CIS processing code to read CIS information
|
||||
from a CardBus device.
|
||||
|
||||
|
||||
=====================================================================*/
|
||||
|
||||
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;
|
||||
|
|
@ -181,7 +182,7 @@ fail:
|
|||
cb_alloc() and cb_free() allocate and free the kernel data
|
||||
structures for a Cardbus device, and handle the lowest level PCI
|
||||
device setup issues.
|
||||
|
||||
|
||||
=====================================================================*/
|
||||
|
||||
/*
|
||||
|
|
@ -207,14 +208,14 @@ static void cardbus_assign_irqs(struct pci_bus *bus, int irq)
|
|||
}
|
||||
}
|
||||
|
||||
int __ref cb_alloc(struct pcmcia_socket * s)
|
||||
int __ref cb_alloc(struct pcmcia_socket *s)
|
||||
{
|
||||
struct pci_bus *bus = s->cb_dev->subordinate;
|
||||
struct pci_dev *dev;
|
||||
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++)
|
||||
|
|
@ -241,7 +242,7 @@ int __ref cb_alloc(struct pcmcia_socket * s)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void cb_free(struct pcmcia_socket * s)
|
||||
void cb_free(struct pcmcia_socket *s)
|
||||
{
|
||||
struct pci_dev *bridge = s->cb_dev;
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
@ -125,7 +125,7 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag
|
|||
|
||||
Low-level functions to read and write CIS memory. I think the
|
||||
write routine is only useful for writing one-byte registers.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
/* Bits in attr field */
|
||||
|
|
@ -137,7 +137,7 @@ int pcmcia_read_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
|
|||
{
|
||||
void __iomem *sys, *end;
|
||||
unsigned char *buf = ptr;
|
||||
|
||||
|
||||
dev_dbg(&s->dev, "pcmcia_read_cis_mem(%d, %#x, %u)\n", attr, addr, len);
|
||||
|
||||
if (attr & IS_INDIRECT) {
|
||||
|
|
@ -203,7 +203,7 @@ void pcmcia_write_cis_mem(struct pcmcia_socket *s, int attr, u_int addr,
|
|||
{
|
||||
void __iomem *sys, *end;
|
||||
unsigned char *buf = ptr;
|
||||
|
||||
|
||||
dev_dbg(&s->dev, "pcmcia_write_cis_mem(%d, %#x, %u)\n", attr, addr, len);
|
||||
|
||||
if (attr & IS_INDIRECT) {
|
||||
|
|
@ -262,7 +262,7 @@ EXPORT_SYMBOL(pcmcia_write_cis_mem);
|
|||
This is a wrapper around read_cis_mem, with the same interface,
|
||||
but which caches information, for cards whose CIS may not be
|
||||
readable all the time.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void read_cis_cache(struct pcmcia_socket *s, int attr, u_int addr,
|
||||
|
|
@ -342,7 +342,7 @@ EXPORT_SYMBOL(destroy_cis_cache);
|
|||
|
||||
This verifies if the CIS of a card matches what is in the CIS
|
||||
cache.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
int verify_cis_cache(struct pcmcia_socket *s)
|
||||
|
|
@ -381,7 +381,7 @@ int verify_cis_cache(struct pcmcia_socket *s)
|
|||
|
||||
For really bad cards, we provide a facility for uploading a
|
||||
replacement CIS.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
int pcmcia_replace_cis(struct pcmcia_socket *s,
|
||||
|
|
@ -406,7 +406,7 @@ EXPORT_SYMBOL(pcmcia_replace_cis);
|
|||
/*======================================================================
|
||||
|
||||
The high-level CIS tuple services
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
typedef struct tuple_flags {
|
||||
|
|
@ -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)
|
||||
|
|
@ -523,10 +521,11 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
|
|||
ofs++; continue;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* 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);
|
||||
|
|
@ -578,7 +577,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
|
|||
} else
|
||||
if (tuple->DesiredTuple == RETURN_FIRST_TUPLE)
|
||||
break;
|
||||
|
||||
|
||||
if (link[0] == tuple->DesiredTuple)
|
||||
break;
|
||||
ofs += link[1] + 2;
|
||||
|
|
@ -587,7 +586,7 @@ int pccard_get_next_tuple(struct pcmcia_socket *s, unsigned int function, tuple_
|
|||
dev_dbg(&s->dev, "cs: overrun in pcmcia_get_next_tuple\n");
|
||||
return -ENOSPC;
|
||||
}
|
||||
|
||||
|
||||
tuple->TupleCode = link[0];
|
||||
tuple->TupleLink = link[1];
|
||||
tuple->CISOffset = ofs + 2;
|
||||
|
|
@ -623,7 +622,7 @@ EXPORT_SYMBOL(pccard_get_tuple_data);
|
|||
/*======================================================================
|
||||
|
||||
Parsing routines for individual tuples
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static int parse_device(tuple_t *tuple, cistpl_device_t *device)
|
||||
|
|
@ -637,26 +636,37 @@ 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;
|
||||
device->dev[i].speed = SPEED_CVT(*p);
|
||||
while (*p & 0x80)
|
||||
if (++p == q)
|
||||
return -EINVAL;
|
||||
break;
|
||||
device->dev[i].speed = SPEED_CVT(*p);
|
||||
while (*p & 0x80)
|
||||
if (++p == q)
|
||||
return -EINVAL;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
if (++p == q)
|
||||
|
|
@ -671,7 +681,7 @@ static int parse_device(tuple_t *tuple, cistpl_device_t *device)
|
|||
if (++p == q)
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -706,9 +716,9 @@ static int parse_longlink_mfc(tuple_t *tuple,
|
|||
{
|
||||
u_char *p;
|
||||
int i;
|
||||
|
||||
|
||||
p = (u_char *)tuple->TupleData;
|
||||
|
||||
|
||||
link->nfn = *p; p++;
|
||||
if (tuple->TupleDataLen <= link->nfn*5)
|
||||
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;
|
||||
|
|
@ -756,10 +768,10 @@ static int parse_strings(u_char *p, u_char *q, int max,
|
|||
static int parse_vers_1(tuple_t *tuple, cistpl_vers_1_t *vers_1)
|
||||
{
|
||||
u_char *p, *q;
|
||||
|
||||
|
||||
p = (u_char *)tuple->TupleData;
|
||||
q = p + tuple->TupleDataLen;
|
||||
|
||||
|
||||
vers_1->major = *p; p++;
|
||||
vers_1->minor = *p; p++;
|
||||
if (p >= q)
|
||||
|
|
@ -774,10 +786,10 @@ static int parse_vers_1(tuple_t *tuple, cistpl_vers_1_t *vers_1)
|
|||
static int parse_altstr(tuple_t *tuple, cistpl_altstr_t *altstr)
|
||||
{
|
||||
u_char *p, *q;
|
||||
|
||||
|
||||
p = (u_char *)tuple->TupleData;
|
||||
q = p + tuple->TupleDataLen;
|
||||
|
||||
|
||||
return parse_strings(p, q, CISTPL_MAX_ALTSTR_STRINGS,
|
||||
altstr->str, altstr->ofs, &altstr->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;
|
||||
|
|
@ -871,7 +884,7 @@ static int parse_config(tuple_t *tuple, cistpl_config_t *config)
|
|||
|
||||
The following routines are all used to parse the nightmarish
|
||||
config table entries.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static u_char *parse_power(u_char *p, u_char *q,
|
||||
|
|
@ -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)) {
|
||||
|
|
@ -955,24 +976,29 @@ static u_char *parse_io(u_char *p, u_char *q, cistpl_io_t *io)
|
|||
io->win[0].len = (1 << (io->flags & CISTPL_IO_LINES_MASK));
|
||||
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;
|
||||
|
|
@ -1095,7 +1126,7 @@ static int parse_cftable_entry(tuple_t *tuple,
|
|||
entry->timing.ready = 0;
|
||||
entry->timing.reserved = 0;
|
||||
}
|
||||
|
||||
|
||||
/* I/O window options */
|
||||
if (features & 0x08) {
|
||||
p = parse_io(p, q, &entry->io);
|
||||
|
|
@ -1103,7 +1134,7 @@ static int parse_cftable_entry(tuple_t *tuple,
|
|||
return -EINVAL;
|
||||
} else
|
||||
entry->io.nwin = 0;
|
||||
|
||||
|
||||
/* Interrupt options */
|
||||
if (features & 0x10) {
|
||||
p = parse_irq(p, q, &entry->irq);
|
||||
|
|
@ -1153,7 +1184,7 @@ static int parse_cftable_entry(tuple_t *tuple,
|
|||
}
|
||||
|
||||
entry->subtuples = q-p;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1176,7 +1207,7 @@ static int parse_bar(tuple_t *tuple, cistpl_bar_t *bar)
|
|||
static int parse_config_cb(tuple_t *tuple, cistpl_config_t *config)
|
||||
{
|
||||
u_char *p;
|
||||
|
||||
|
||||
p = (u_char *)tuple->TupleData;
|
||||
if ((*p != 3) || (tuple->TupleDataLen < 6))
|
||||
return -EINVAL;
|
||||
|
|
@ -1231,7 +1262,7 @@ static int parse_cftable_entry_cb(tuple_t *tuple,
|
|||
entry->io = *p; p++;
|
||||
} else
|
||||
entry->io = 0;
|
||||
|
||||
|
||||
/* Interrupt options */
|
||||
if (features & 0x10) {
|
||||
p = parse_irq(p, q, &entry->irq);
|
||||
|
|
@ -1264,7 +1295,7 @@ static int parse_cftable_entry_cb(tuple_t *tuple,
|
|||
}
|
||||
|
||||
entry->subtuples = q-p;
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -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);
|
||||
|
|
@ -1302,13 +1334,13 @@ static int parse_vers_2(tuple_t *tuple, cistpl_vers_2_t *v2)
|
|||
|
||||
if (tuple->TupleDataLen < 10)
|
||||
return -EINVAL;
|
||||
|
||||
|
||||
p = tuple->TupleData;
|
||||
q = p + tuple->TupleDataLen;
|
||||
|
||||
v2->vers = p[0];
|
||||
v2->comply = p[1];
|
||||
v2->dindex = get_unaligned_le16(p +2 );
|
||||
v2->dindex = get_unaligned_le16(p + 2);
|
||||
v2->vspec8 = p[6];
|
||||
v2->vspec9 = p[7];
|
||||
v2->nhdr = p[8];
|
||||
|
|
@ -1322,7 +1354,7 @@ static int parse_org(tuple_t *tuple, cistpl_org_t *org)
|
|||
{
|
||||
u_char *p, *q;
|
||||
int i;
|
||||
|
||||
|
||||
p = tuple->TupleData;
|
||||
q = p + tuple->TupleDataLen;
|
||||
if (p == q)
|
||||
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -1363,7 +1396,7 @@ static int parse_format(tuple_t *tuple, cistpl_format_t *fmt)
|
|||
int pcmcia_parse_tuple(tuple_t *tuple, cisparse_t *parse)
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
|
||||
if (tuple->TupleDataLen > tuple->TupleDataMax)
|
||||
return -EINVAL;
|
||||
switch (tuple->TupleCode) {
|
||||
|
|
@ -1448,7 +1481,7 @@ EXPORT_SYMBOL(pcmcia_parse_tuple);
|
|||
/*======================================================================
|
||||
|
||||
This is used internally by Card Services to look up CIS stuff.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse)
|
||||
|
|
@ -1550,7 +1583,7 @@ EXPORT_SYMBOL(pccard_loop_tuple);
|
|||
checks include making sure several critical tuples are present and
|
||||
valid; seeing if the total number of tuples is reasonable; and
|
||||
looking for tuples that use reserved codes.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info)
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ int pcmcia_socket_dev_resume(struct device *dev)
|
|||
EXPORT_SYMBOL(pcmcia_socket_dev_resume);
|
||||
|
||||
|
||||
struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt)
|
||||
struct pcmcia_socket *pcmcia_get_socket(struct pcmcia_socket *skt)
|
||||
{
|
||||
struct device *dev = get_device(&skt->dev);
|
||||
if (!dev)
|
||||
|
|
@ -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);
|
||||
|
||||
|
|
@ -297,7 +297,7 @@ void pcmcia_unregister_socket(struct pcmcia_socket *socket)
|
|||
EXPORT_SYMBOL(pcmcia_unregister_socket);
|
||||
|
||||
|
||||
struct pcmcia_socket * pcmcia_get_socket_by_nr(unsigned int nr)
|
||||
struct pcmcia_socket *pcmcia_get_socket_by_nr(unsigned int nr)
|
||||
{
|
||||
struct pcmcia_socket *s;
|
||||
|
||||
|
|
@ -736,7 +736,7 @@ EXPORT_SYMBOL(pcmcia_parse_events);
|
|||
/* register pcmcia_callback */
|
||||
int pccard_register_pcmcia(struct pcmcia_socket *s, struct pcmcia_callback *c)
|
||||
{
|
||||
int ret = 0;
|
||||
int ret = 0;
|
||||
|
||||
/* s->skt_mutex also protects s->callback */
|
||||
mutex_lock(&s->skt_mutex);
|
||||
|
|
@ -848,7 +848,7 @@ EXPORT_SYMBOL(pcmcia_suspend_card);
|
|||
int pcmcia_resume_card(struct pcmcia_socket *skt)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
||||
dev_dbg(&skt->dev, "waking up socket\n");
|
||||
|
||||
mutex_lock(&skt->skt_mutex);
|
||||
|
|
@ -876,7 +876,7 @@ EXPORT_SYMBOL(pcmcia_resume_card);
|
|||
int pcmcia_eject_card(struct pcmcia_socket *skt)
|
||||
{
|
||||
int ret;
|
||||
|
||||
|
||||
dev_dbg(&skt->dev, "user eject request\n");
|
||||
|
||||
mutex_lock(&skt->skt_mutex);
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ static void pcmcia_check_driver(struct pcmcia_driver *p_drv)
|
|||
"function\n", p_drv->drv.name);
|
||||
|
||||
while (did && did->match_flags) {
|
||||
for (i=0; i<4; i++) {
|
||||
for (i = 0; i < 4; i++) {
|
||||
if (!did->prod_id[i])
|
||||
continue;
|
||||
|
||||
|
|
@ -105,7 +105,7 @@ pcmcia_store_new_id(struct device_driver *driver, const char *buf, size_t count)
|
|||
__u16 match_flags, manf_id, card_id;
|
||||
__u8 func_id, function, device_no;
|
||||
__u32 prod_id_hash[4] = {0, 0, 0, 0};
|
||||
int fields=0;
|
||||
int fields = 0;
|
||||
int retval = 0;
|
||||
|
||||
fields = sscanf(buf, "%hx %hx %hx %hhx %hhx %hhx %x %x %x %x",
|
||||
|
|
@ -214,7 +214,7 @@ EXPORT_SYMBOL(pcmcia_unregister_driver);
|
|||
|
||||
/* pcmcia_device handling */
|
||||
|
||||
struct pcmcia_device * pcmcia_get_dev(struct pcmcia_device *p_dev)
|
||||
struct pcmcia_device *pcmcia_get_dev(struct pcmcia_device *p_dev)
|
||||
{
|
||||
struct device *tmp_dev;
|
||||
tmp_dev = get_device(&p_dev->dev);
|
||||
|
|
@ -258,7 +258,7 @@ static void pcmcia_add_device_later(struct pcmcia_socket *s, int mfc)
|
|||
return;
|
||||
}
|
||||
|
||||
static int pcmcia_device_probe(struct device * dev)
|
||||
static int pcmcia_device_probe(struct device *dev)
|
||||
{
|
||||
struct pcmcia_device *p_dev;
|
||||
struct pcmcia_driver *p_drv;
|
||||
|
|
@ -325,7 +325,7 @@ put_module:
|
|||
put_dev:
|
||||
if (ret)
|
||||
put_device(dev);
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -354,7 +354,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
|
|||
|
||||
spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
|
||||
list_del(&p_dev->socket_device_list);
|
||||
p_dev->_removed=1;
|
||||
p_dev->_removed = 1;
|
||||
spin_unlock_irqrestore(&pcmcia_dev_list_lock, flags);
|
||||
|
||||
dev_dbg(&p_dev->dev, "unregistering device\n");
|
||||
|
|
@ -364,7 +364,7 @@ static void pcmcia_card_remove(struct pcmcia_socket *s, struct pcmcia_device *le
|
|||
return;
|
||||
}
|
||||
|
||||
static int pcmcia_device_remove(struct device * dev)
|
||||
static int pcmcia_device_remove(struct device *dev)
|
||||
{
|
||||
struct pcmcia_device *p_dev;
|
||||
struct pcmcia_driver *p_drv;
|
||||
|
|
@ -391,7 +391,7 @@ static int pcmcia_device_remove(struct device * dev)
|
|||
return 0;
|
||||
|
||||
if (p_drv->remove)
|
||||
p_drv->remove(p_dev);
|
||||
p_drv->remove(p_dev);
|
||||
|
||||
p_dev->dev_node = NULL;
|
||||
|
||||
|
|
@ -499,7 +499,7 @@ static int pcmcia_device_query(struct pcmcia_device *p_dev)
|
|||
*/
|
||||
static DEFINE_MUTEX(device_add_lock);
|
||||
|
||||
struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int function)
|
||||
struct pcmcia_device *pcmcia_device_add(struct pcmcia_socket *s, unsigned int function)
|
||||
{
|
||||
struct pcmcia_device *p_dev, *tmp_dev;
|
||||
unsigned long flags;
|
||||
|
|
@ -545,8 +545,8 @@ struct pcmcia_device * pcmcia_device_add(struct pcmcia_socket *s, unsigned int f
|
|||
* Note that this is serialized by the device_add_lock, so that
|
||||
* only one such struct will be created.
|
||||
*/
|
||||
list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
|
||||
if (p_dev->func == tmp_dev->func) {
|
||||
list_for_each_entry(tmp_dev, &s->devices_list, socket_device_list)
|
||||
if (p_dev->func == tmp_dev->func) {
|
||||
p_dev->function_config = tmp_dev->function_config;
|
||||
p_dev->io = tmp_dev->io;
|
||||
p_dev->irq = tmp_dev->irq;
|
||||
|
|
@ -627,10 +627,10 @@ static int pcmcia_card_add(struct pcmcia_socket *s)
|
|||
no_funcs = 1;
|
||||
s->functions = no_funcs;
|
||||
|
||||
for (i=0; i < no_funcs; i++)
|
||||
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 */
|
||||
|
|
@ -852,7 +852,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
|
|||
|
||||
if (did->match_flags & PCMCIA_DEV_ID_MATCH_ANONYMOUS) {
|
||||
int i;
|
||||
for (i=0; i<4; i++)
|
||||
for (i = 0; i < 4; i++)
|
||||
if (dev->prod_id[i])
|
||||
return 0;
|
||||
if (dev->has_manf_id || dev->has_card_id || dev->has_func_id)
|
||||
|
|
@ -865,9 +865,10 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
|
|||
}
|
||||
|
||||
|
||||
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);
|
||||
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;
|
||||
struct pcmcia_dynid *dynid;
|
||||
|
||||
|
|
@ -917,7 +918,7 @@ static int pcmcia_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
|
|||
p_dev = to_pcmcia_dev(dev);
|
||||
|
||||
/* calculate hashes */
|
||||
for (i=0; i<4; i++) {
|
||||
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]));
|
||||
|
|
@ -984,14 +985,14 @@ static void runtime_resume(struct device *dev)
|
|||
static ssize_t field##_show (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \
|
||||
return p_dev->test ? sprintf (buf, format, p_dev->field) : -ENODEV; \
|
||||
return p_dev->test ? sprintf(buf, format, p_dev->field) : -ENODEV; \
|
||||
}
|
||||
|
||||
#define pcmcia_device_stringattr(name, field) \
|
||||
static ssize_t name##_show (struct device *dev, struct device_attribute *attr, char *buf) \
|
||||
{ \
|
||||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); \
|
||||
return p_dev->field ? sprintf (buf, "%s\n", p_dev->field) : -ENODEV; \
|
||||
return p_dev->field ? sprintf(buf, "%s\n", p_dev->field) : -ENODEV; \
|
||||
}
|
||||
|
||||
pcmcia_device_attr(func, socket, "0x%02x\n");
|
||||
|
|
@ -1020,8 +1021,8 @@ static ssize_t pcmcia_store_pm_state(struct device *dev, struct device_attribute
|
|||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
|
||||
int ret = 0;
|
||||
|
||||
if (!count)
|
||||
return -EINVAL;
|
||||
if (!count)
|
||||
return -EINVAL;
|
||||
|
||||
if ((!p_dev->suspended) && !strncmp(buf, "off", 3))
|
||||
ret = runtime_suspend(dev);
|
||||
|
|
@ -1039,10 +1040,11 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
|
|||
u32 hash[4] = { 0, 0, 0, 0};
|
||||
|
||||
/* calculate hashes */
|
||||
for (i=0; i<4; i++) {
|
||||
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",
|
||||
|
|
@ -1091,7 +1093,7 @@ static struct device_attribute pcmcia_dev_attrs[] = {
|
|||
|
||||
/* PM support, also needed for reset */
|
||||
|
||||
static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
|
||||
static int pcmcia_dev_suspend(struct device *dev, pm_message_t state)
|
||||
{
|
||||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
|
||||
struct pcmcia_driver *p_drv = NULL;
|
||||
|
|
@ -1131,10 +1133,10 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
|
|||
}
|
||||
|
||||
|
||||
static int pcmcia_dev_resume(struct device * dev)
|
||||
static int pcmcia_dev_resume(struct device *dev)
|
||||
{
|
||||
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
|
||||
struct pcmcia_driver *p_drv = NULL;
|
||||
struct pcmcia_driver *p_drv = NULL;
|
||||
int ret = 0;
|
||||
|
||||
if (!p_dev->suspended)
|
||||
|
|
@ -1211,7 +1213,7 @@ static int pcmcia_bus_suspend(struct pcmcia_socket *skt)
|
|||
/*======================================================================
|
||||
|
||||
The card status event handler.
|
||||
|
||||
|
||||
======================================================================*/
|
||||
|
||||
/* Normally, the event is passed to individual drivers after
|
||||
|
|
@ -1264,7 +1266,7 @@ static int ds_event(struct pcmcia_socket *skt, event_t event, int priority)
|
|||
} /* ds_event */
|
||||
|
||||
|
||||
struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *_p_dev)
|
||||
struct pcmcia_device *pcmcia_dev_present(struct pcmcia_device *_p_dev)
|
||||
{
|
||||
struct pcmcia_device *p_dev;
|
||||
struct pcmcia_device *ret = NULL;
|
||||
|
|
@ -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;
|
||||
|
|
@ -1400,7 +1402,7 @@ static int __init init_pcmcia_bus(void)
|
|||
|
||||
return 0;
|
||||
}
|
||||
fs_initcall(init_pcmcia_bus); /* one level after subsys_initcall so that
|
||||
fs_initcall(init_pcmcia_bus); /* one level after subsys_initcall so that
|
||||
* pcmcia_socket_class is already registered */
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
@ -195,7 +196,7 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
|
|||
begin = adj->resource.memory.Base;
|
||||
end = adj->resource.memory.Base + adj->resource.memory.Size - 1;
|
||||
if (s->resource_ops->add_mem)
|
||||
ret =s->resource_ops->add_mem(s, adj->Action, begin, end);
|
||||
ret = s->resource_ops->add_mem(s, adj->Action, begin, end);
|
||||
case RES_IO_RANGE:
|
||||
begin = adj->resource.io.BasePort;
|
||||
end = adj->resource.io.BasePort + adj->resource.io.NumPorts - 1;
|
||||
|
|
@ -215,7 +216,7 @@ static int pcmcia_adjust_resource_info(adjust_t *adj)
|
|||
}
|
||||
up_read(&pcmcia_socket_list_rwsem);
|
||||
|
||||
return (ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -490,7 +491,7 @@ static int bind_request(struct pcmcia_socket *s, bind_info_t *bind_info)
|
|||
}
|
||||
|
||||
spin_lock_irqsave(&pcmcia_dev_list_lock, flags);
|
||||
list_for_each_entry(p_dev, &s->devices_list, socket_device_list) {
|
||||
list_for_each_entry(p_dev, &s->devices_list, socket_device_list) {
|
||||
if (p_dev->func == bind_info->function) {
|
||||
if ((p_dev->dev.driver == &p_drv->drv)) {
|
||||
if (p_dev->cardmgr) {
|
||||
|
|
@ -558,7 +559,7 @@ rescan:
|
|||
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;
|
||||
|
|
@ -774,7 +776,7 @@ static ssize_t ds_read(struct file *file, char __user *buf,
|
|||
|
||||
s = user->socket;
|
||||
if (s->pcmcia_state.dead)
|
||||
return -EIO;
|
||||
return -EIO;
|
||||
|
||||
ret = wait_event_interruptible(s->queue, !queue_empty(user));
|
||||
if (ret == 0)
|
||||
|
|
@ -824,7 +826,7 @@ static u_int ds_poll(struct file *file, poll_table *wait)
|
|||
|
||||
/*====================================================================*/
|
||||
|
||||
static int ds_ioctl(struct inode * inode, struct file * file,
|
||||
static int ds_ioctl(struct inode *inode, struct file *file,
|
||||
u_int cmd, u_long arg)
|
||||
{
|
||||
struct pcmcia_socket *s;
|
||||
|
|
@ -842,10 +844,11 @@ static int ds_ioctl(struct inode * inode, struct file * file,
|
|||
|
||||
s = user->socket;
|
||||
if (s->pcmcia_state.dead)
|
||||
return -EIO;
|
||||
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))
|
||||
|
|
@ -1024,8 +1027,8 @@ static int ds_ioctl(struct inode * inode, struct file * file,
|
|||
}
|
||||
|
||||
if (cmd & IOC_OUT) {
|
||||
if (__copy_to_user(uarg, (char *)buf, size))
|
||||
err = -EFAULT;
|
||||
if (__copy_to_user(uarg, (char *)buf, size))
|
||||
err = -EFAULT;
|
||||
}
|
||||
|
||||
free_out:
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
|
||||
/* Access speed for IO windows */
|
||||
static int io_speed = 0;
|
||||
static int io_speed;
|
||||
module_param(io_speed, int, 0444);
|
||||
|
||||
|
||||
|
|
@ -62,7 +62,8 @@ static int alloc_io_space(struct pcmcia_socket *s, u_int attr,
|
|||
num, align);
|
||||
align = 0;
|
||||
} else
|
||||
while (align && (align < num)) align <<= 1;
|
||||
while (align && (align < num))
|
||||
align <<= 1;
|
||||
}
|
||||
if (*base & ~(align-1)) {
|
||||
dev_dbg(&s->dev, "odd IO request: base %#x align %#x\n",
|
||||
|
|
@ -338,7 +339,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
|
|||
struct pcmcia_socket *s = p_dev->socket;
|
||||
config_t *c = p_dev->function_config;
|
||||
|
||||
if (!p_dev->_io )
|
||||
if (!p_dev->_io)
|
||||
return -EINVAL;
|
||||
|
||||
p_dev->_io = 0;
|
||||
|
|
@ -362,7 +363,7 @@ static int pcmcia_release_io(struct pcmcia_device *p_dev, io_req_t *req)
|
|||
static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
||||
{
|
||||
struct pcmcia_socket *s = p_dev->socket;
|
||||
config_t *c= p_dev->function_config;
|
||||
config_t *c = p_dev->function_config;
|
||||
|
||||
if (!p_dev->_irq)
|
||||
return -EINVAL;
|
||||
|
|
@ -383,9 +384,8 @@ static int pcmcia_release_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
|||
s->irq.AssignedIRQ = 0;
|
||||
}
|
||||
|
||||
if (req->Handler) {
|
||||
if (req->Handler)
|
||||
free_irq(req->AssignedIRQ, p_dev->priv);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
pcmcia_used_irq[req->AssignedIRQ]--;
|
||||
|
|
@ -656,7 +656,8 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req)
|
|||
type = IRQF_SHARED;
|
||||
else if (req->Attributes & IRQ_TYPE_DYNAMIC_SHARING)
|
||||
type = IRQF_SHARED;
|
||||
else printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
|
||||
else
|
||||
printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");
|
||||
|
||||
#ifdef CONFIG_PCMCIA_PROBE
|
||||
|
||||
|
|
@ -788,7 +789,8 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_ha
|
|||
|
||||
/* Allocate system memory window */
|
||||
for (w = 0; w < MAX_WIN; w++)
|
||||
if (!(s->state & SOCKET_WIN_REQ(w))) break;
|
||||
if (!(s->state & SOCKET_WIN_REQ(w)))
|
||||
break;
|
||||
if (w == MAX_WIN) {
|
||||
dev_dbg(&s->dev, "all windows are used already\n");
|
||||
return -EINVAL;
|
||||
|
|
@ -826,18 +828,19 @@ int pcmcia_request_window(struct pcmcia_device *p_dev, win_req_t *req, window_ha
|
|||
s->state |= SOCKET_WIN_REQ(w);
|
||||
|
||||
/* Return window handle */
|
||||
if (s->features & SS_CAP_STATIC_MAP) {
|
||||
if (s->features & SS_CAP_STATIC_MAP)
|
||||
req->Base = win->static_start;
|
||||
} else {
|
||||
else
|
||||
req->Base = win->res->start;
|
||||