Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 255368
b: refs/heads/master
c: a18c715
h: refs/heads/master
v: v3
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed Jun 1, 2011
1 parent 3a1da12 commit 51b9621
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 23 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: 0581483afe1a6f90f828b36111b05a70c162137d
refs/heads/master: a18c715e63505850edd2b69ded5373d6d464cd80
4 changes: 4 additions & 0 deletions trunk/drivers/net/wireless/b43/bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ struct b43_bus_dev *b43_bus_dev_ssb_init(struct ssb_device *sdev)
dev->block_read = b43_bus_ssb_block_read;
dev->block_write = b43_bus_ssb_block_write;

dev->dev = sdev->dev;
dev->dma_dev = sdev->dma_dev;
dev->irq = sdev->irq;

dev->bus_sprom = &sdev->bus->sprom;

dev->core_id = sdev->id.coreid;
Expand Down
4 changes: 4 additions & 0 deletions trunk/drivers/net/wireless/b43/bus.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ struct b43_bus_dev {
void (*block_write)(struct b43_bus_dev *dev, const void *buffer,
size_t count, u16 offset, u8 reg_width);

struct device *dev;
struct device *dma_dev;
unsigned int irq;

struct ssb_sprom *bus_sprom;

u16 core_id;
Expand Down
28 changes: 14 additions & 14 deletions trunk/drivers/net/wireless/b43/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,10 +333,10 @@ static inline
dma_addr_t dmaaddr;

if (tx) {
dmaaddr = dma_map_single(ring->dev->sdev->dma_dev,
dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
buf, len, DMA_TO_DEVICE);
} else {
dmaaddr = dma_map_single(ring->dev->sdev->dma_dev,
dmaaddr = dma_map_single(ring->dev->dev->dma_dev,
buf, len, DMA_FROM_DEVICE);
}

Expand All @@ -348,10 +348,10 @@ static inline
dma_addr_t addr, size_t len, int tx)
{
if (tx) {
dma_unmap_single(ring->dev->sdev->dma_dev,
dma_unmap_single(ring->dev->dev->dma_dev,
addr, len, DMA_TO_DEVICE);
} else {
dma_unmap_single(ring->dev->sdev->dma_dev,
dma_unmap_single(ring->dev->dev->dma_dev,
addr, len, DMA_FROM_DEVICE);
}
}
Expand All @@ -361,7 +361,7 @@ static inline
dma_addr_t addr, size_t len)
{
B43_WARN_ON(ring->tx);
dma_sync_single_for_cpu(ring->dev->sdev->dma_dev,
dma_sync_single_for_cpu(ring->dev->dev->dma_dev,
addr, len, DMA_FROM_DEVICE);
}

Expand All @@ -370,7 +370,7 @@ static inline
dma_addr_t addr, size_t len)
{
B43_WARN_ON(ring->tx);
dma_sync_single_for_device(ring->dev->sdev->dma_dev,
dma_sync_single_for_device(ring->dev->dev->dma_dev,
addr, len, DMA_FROM_DEVICE);
}

Expand Down Expand Up @@ -401,7 +401,7 @@ static int alloc_ringmemory(struct b43_dmaring *ring)
*/
if (ring->type == B43_DMA_64BIT)
flags |= GFP_DMA;
ring->descbase = dma_alloc_coherent(ring->dev->sdev->dma_dev,
ring->descbase = dma_alloc_coherent(ring->dev->dev->dma_dev,
B43_DMA_RINGMEMSIZE,
&(ring->dmabase), flags);
if (!ring->descbase) {
Expand All @@ -415,7 +415,7 @@ static int alloc_ringmemory(struct b43_dmaring *ring)

static void free_ringmemory(struct b43_dmaring *ring)
{
dma_free_coherent(ring->dev->sdev->dma_dev, B43_DMA_RINGMEMSIZE,
dma_free_coherent(ring->dev->dev->dma_dev, B43_DMA_RINGMEMSIZE,
ring->descbase, ring->dmabase);
}

Expand Down Expand Up @@ -523,7 +523,7 @@ static bool b43_dma_mapping_error(struct b43_dmaring *ring,
dma_addr_t addr,
size_t buffersize, bool dma_to_device)
{
if (unlikely(dma_mapping_error(ring->dev->sdev->dma_dev, addr)))
if (unlikely(dma_mapping_error(ring->dev->dev->dma_dev, addr)))
return 1;

switch (ring->type) {
Expand Down Expand Up @@ -869,7 +869,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
goto err_kfree_meta;

/* test for ability to dma to txhdr_cache */
dma_test = dma_map_single(dev->sdev->dma_dev,
dma_test = dma_map_single(dev->dev->dma_dev,
ring->txhdr_cache,
b43_txhdr_size(dev),
DMA_TO_DEVICE);
Expand All @@ -884,7 +884,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
if (!ring->txhdr_cache)
goto err_kfree_meta;

dma_test = dma_map_single(dev->sdev->dma_dev,
dma_test = dma_map_single(dev->dev->dma_dev,
ring->txhdr_cache,
b43_txhdr_size(dev),
DMA_TO_DEVICE);
Expand All @@ -898,7 +898,7 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
}
}

dma_unmap_single(dev->sdev->dma_dev,
dma_unmap_single(dev->dev->dma_dev,
dma_test, b43_txhdr_size(dev),
DMA_TO_DEVICE);
}
Expand Down Expand Up @@ -1013,9 +1013,9 @@ static int b43_dma_set_mask(struct b43_wldev *dev, u64 mask)
/* Try to set the DMA mask. If it fails, try falling back to a
* lower mask, as we can always also support a lower one. */
while (1) {
err = dma_set_mask(dev->sdev->dma_dev, mask);
err = dma_set_mask(dev->dev->dma_dev, mask);
if (!err) {
err = dma_set_coherent_mask(dev->sdev->dma_dev, mask);
err = dma_set_coherent_mask(dev->dev->dma_dev, mask);
if (!err)
break;
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/net/wireless/b43/leds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ static int b43_register_led(struct b43_wldev *dev, struct b43_led *led,
led->led_dev.default_trigger = default_trigger;
led->led_dev.brightness_set = b43_led_brightness_set;

err = led_classdev_register(dev->sdev->dev, &led->led_dev);
err = led_classdev_register(dev->dev->dev, &led->led_dev);
if (err) {
b43warn(dev->wl, "LEDs: Failed to register %s\n", name);
led->wl = NULL;
Expand Down
10 changes: 5 additions & 5 deletions trunk/drivers/net/wireless/b43/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2063,7 +2063,7 @@ int b43_do_request_fw(struct b43_request_fw_context *ctx,
B43_WARN_ON(1);
return -ENOSYS;
}
err = request_firmware(&blob, ctx->fwname, ctx->dev->sdev->dev);
err = request_firmware(&blob, ctx->fwname, ctx->dev->dev->dev);
if (err == -ENOENT) {
snprintf(ctx->errors[ctx->req_type],
sizeof(ctx->errors[ctx->req_type]),
Expand Down Expand Up @@ -3970,8 +3970,8 @@ static struct b43_wldev * b43_wireless_core_stop(struct b43_wldev *dev)
if (dev->sdev->bus->bustype == SSB_BUSTYPE_SDIO) {
b43_sdio_free_irq(dev);
} else {
synchronize_irq(dev->sdev->irq);
free_irq(dev->sdev->irq, dev);
synchronize_irq(dev->dev->irq);
free_irq(dev->dev->irq, dev);
}
mutex_lock(&wl->mutex);
dev = wl->current_dev;
Expand Down Expand Up @@ -4011,12 +4011,12 @@ static int b43_wireless_core_start(struct b43_wldev *dev)
goto out;
}
} else {
err = request_threaded_irq(dev->sdev->irq, b43_interrupt_handler,
err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler,
b43_interrupt_thread_handler,
IRQF_SHARED, KBUILD_MODNAME, dev);
if (err) {
b43err(dev->wl, "Cannot request IRQ-%d\n",
dev->sdev->irq);
dev->dev->irq);
goto out;
}
}
Expand Down
4 changes: 2 additions & 2 deletions trunk/drivers/net/wireless/b43/sysfs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ static DEVICE_ATTR(interference, 0644,

int b43_sysfs_register(struct b43_wldev *wldev)
{
struct device *dev = wldev->sdev->dev;
struct device *dev = wldev->dev->dev;

B43_WARN_ON(b43_status(wldev) != B43_STAT_INITIALIZED);

Expand All @@ -149,7 +149,7 @@ int b43_sysfs_register(struct b43_wldev *wldev)

void b43_sysfs_unregister(struct b43_wldev *wldev)
{
struct device *dev = wldev->sdev->dev;
struct device *dev = wldev->dev->dev;

device_remove_file(dev, &dev_attr_interference);
}

0 comments on commit 51b9621

Please sign in to comment.