Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 267891
b: refs/heads/master
c: 75bf74b
h: refs/heads/master
i:
  267889: bda80b3
  267887: fb6df20
v: v3
  • Loading branch information
Joe Perches authored and Greg Kroah-Hartman committed Aug 25, 2011
1 parent 249e232 commit 88c7d75
Show file tree
Hide file tree
Showing 8 changed files with 695 additions and 863 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 09ebd6f23b07f1eb0c8850af32d05519ddeaa524
refs/heads/master: 75bf74b90fd0c21b92d5e6153eb40388812e7096
46 changes: 21 additions & 25 deletions trunk/drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,7 @@ brcmf_sdcard_iovar_op(struct brcmf_sdio_dev *sdiodev, const char *name,
if (!set && !(arg && len))
return -EINVAL;

BRCMF_TRACE(("%s: Enter (%s %s)\n", __func__, (set ? "set" : "get"),
name));
brcmf_dbg(TRACE, "Enter (%s %s)\n", set ? "set" : "get", name);

vi = brcmu_iovar_lookup(sdioh_iovars, name);
if (vi == NULL) {
Expand Down Expand Up @@ -168,7 +167,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func)
{
struct brcmf_sdio_dev *sdiodev = dev_get_drvdata(&func->card->dev);

BRCMF_TRACE(("brcmf: ***IRQHandler\n"));
brcmf_dbg(TRACE, "***IRQHandler\n");

sdio_release_host(func);

Expand All @@ -179,7 +178,7 @@ static void brcmf_sdioh_irqhandler(struct sdio_func *func)

int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)
{
BRCMF_TRACE(("%s: Entering\n", __func__));
brcmf_dbg(TRACE, "Entering\n");

sdio_claim_host(sdiodev->func[1]);
sdio_claim_irq(sdiodev->func[1], brcmf_sdioh_irqhandler);
Expand All @@ -190,7 +189,7 @@ int brcmf_sdcard_intr_reg(struct brcmf_sdio_dev *sdiodev)

int brcmf_sdcard_intr_dereg(struct brcmf_sdio_dev *sdiodev)
{
BRCMF_TRACE(("%s: Entering\n", __func__));
brcmf_dbg(TRACE, "Entering\n");

sdio_claim_host(sdiodev->func[1]);
sdio_release_irq(sdiodev->func[1]);
Expand All @@ -216,8 +215,8 @@ u8 brcmf_sdcard_cfg_read(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
if (err)
*err = status;

BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));
brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
fnc_num, addr, data);

return data;
}
Expand All @@ -239,8 +238,8 @@ brcmf_sdcard_cfg_write(struct brcmf_sdio_dev *sdiodev, uint fnc_num, u32 addr,
if (err)
*err = status;

BRCMF_INFO(("%s:fun = %d, addr = 0x%x, u8data = 0x%x\n",
__func__, fnc_num, addr, data));
brcmf_dbg(INFO, "fun = %d, addr = 0x%x, u8data = 0x%x\n",
fnc_num, addr, data);
}

int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis,
Expand All @@ -260,7 +259,7 @@ int brcmf_sdcard_cis_read(struct brcmf_sdio_dev *sdiodev, uint func, u8 * cis,
into the provided buffer. */
tmp_buf = kmalloc(length, GFP_ATOMIC);
if (tmp_buf == NULL) {
BRCMF_ERROR(("%s: out of memory\n", __func__));
brcmf_dbg(ERROR, "out of memory\n");
return -ENOMEM;
}
memcpy(tmp_buf, cis, length);
Expand Down Expand Up @@ -302,7 +301,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
u32 word = 0;
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;

BRCMF_INFO(("%s:fun = 1, addr = 0x%x, ", __func__, addr));
brcmf_dbg(INFO, "fun = 1, addr = 0x%x\n", addr);

if (bar0 != sdiodev->sbwad) {
if (brcmf_sdcard_set_sbaddr_window(sdiodev, bar0))
Expand All @@ -320,7 +319,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)

sdiodev->regfail = (status != 0);

BRCMF_INFO(("u32data = 0x%x\n", word));
brcmf_dbg(INFO, "u32data = 0x%x\n", word);

/* if ok, return appropriately masked word */
if (status == 0) {
Expand All @@ -338,8 +337,7 @@ u32 brcmf_sdcard_reg_read(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size)
}

/* otherwise, bad sdio access or invalid size */
BRCMF_ERROR(("%s: error reading addr 0x%04x size %d\n", __func__,
addr, size));
brcmf_dbg(ERROR, "error reading addr 0x%04x size %d\n", addr, size);
return 0xFFFFFFFF;
}

Expand All @@ -350,8 +348,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;

BRCMF_INFO(("%s:fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",
__func__, addr, size * 8, data));
brcmf_dbg(INFO, "fun = 1, addr = 0x%x, uint%ddata = 0x%x\n",
addr, size * 8, data);

if (bar0 != sdiodev->sbwad) {
err = brcmf_sdcard_set_sbaddr_window(sdiodev, bar0);
Expand All @@ -372,8 +370,8 @@ u32 brcmf_sdcard_reg_write(struct brcmf_sdio_dev *sdiodev, u32 addr, uint size,
if (status == 0)
return 0;

BRCMF_ERROR(("%s: error writing 0x%08x to addr 0x%04x size %d\n",
__func__, data, addr, size));
brcmf_dbg(ERROR, "error writing 0x%08x to addr 0x%04x size %d\n",
data, addr, size);
return 0xFFFFFFFF;
}

Expand All @@ -393,8 +391,7 @@ brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;

BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",
__func__, fn, addr, nbytes));
brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);

/* Async not implemented yet */
if (flags & SDIO_REQ_ASYNC)
Expand Down Expand Up @@ -430,8 +427,7 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
uint bar0 = addr & ~SBSDIO_SB_OFT_ADDR_MASK;
int err = 0;

BRCMF_INFO(("%s:fun = %d, addr = 0x%x, size = %d\n",
__func__, fn, addr, nbytes));
brcmf_dbg(INFO, "fun = %d, addr = 0x%x, size = %d\n", fn, addr, nbytes);

/* Async not implemented yet */
if (flags & SDIO_REQ_ASYNC)
Expand Down Expand Up @@ -470,13 +466,13 @@ int brcmf_sdcard_rwdata(struct brcmf_sdio_dev *sdiodev, uint rw, u32 addr,
int brcmf_sdcard_abort(struct brcmf_sdio_dev *sdiodev, uint fn)
{
char t_func = (char)fn;
BRCMF_TRACE(("%s: Enter\n", __func__));
brcmf_dbg(TRACE, "Enter\n");

/* issue abort cmd52 command through F0 */
brcmf_sdioh_request_byte(sdiodev, SDIOH_WRITE, SDIO_FUNC_0,
SDIO_CCCR_ABORT, &t_func);

BRCMF_TRACE(("%s: Exit\n", __func__));
brcmf_dbg(TRACE, "Exit\n");
return 0;
}

Expand All @@ -502,7 +498,7 @@ int brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
/* try to attach to the target device */
sdiodev->bus = brcmf_sdbrcm_probe(0, 0, 0, 0, regs, sdiodev);
if (!sdiodev->bus) {
BRCMF_ERROR(("%s: device attach failed\n", __func__));
brcmf_dbg(ERROR, "device attach failed\n");
ret = -ENODEV;
goto out;
}
Expand Down
Loading

0 comments on commit 88c7d75

Please sign in to comment.