package/mac80211/patches/401-ath9k-convert-to-struct-device.patch

   1 From 1f8e398032f7aa8a06ac950fe1d4e0a48d7578b2 Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Mon, 5 Jan 2009 10:45:00 +0100
   4 Subject: [PATCH v3 01/11] ath9k: convert to struct device
   5
   6 Convert 'struct pci_dev' to 'struct device' to make it usable on the AHB
   7 bus as well.
   8
   9 Changes-licensed-under: ISC
  10
  11 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  12 Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
  13 ---
  14  drivers/net/wireless/ath9k/beacon.c |   17 ++++++++++-------
  15  drivers/net/wireless/ath9k/core.h   |    2 +-
  16  drivers/net/wireless/ath9k/main.c   |   21 +++++++++++----------
  17  drivers/net/wireless/ath9k/recv.c   |   15 +++++++++------
  18  drivers/net/wireless/ath9k/xmit.c   |    7 ++++---
  19  5 files changed, 35 insertions(+), 27 deletions(-)
  20
  21 --- a/drivers/net/wireless/ath9k/beacon.c
  22 +++ b/drivers/net/wireless/ath9k/beacon.c
  23 @@ -164,7 +164,7 @@ static struct ath_buf *ath_beacon_genera
  24         bf = avp->av_bcbuf;
  25         skb = (struct sk_buff *)bf->bf_mpdu;
  26         if (skb) {
  27 -               pci_unmap_single(sc->pdev, bf->bf_dmacontext,
  28 +               pci_unmap_single(to_pci_dev(sc->dev), bf->bf_dmacontext,
  29                                  skb->len,
  30                                  PCI_DMA_TODEVICE);
  31                 dev_kfree_skb_any(skb);
  32 @@ -188,10 +188,11 @@ static struct ath_buf *ath_beacon_genera
  33         }
  34
  35         bf->bf_buf_addr = bf->bf_dmacontext =
  36 -               pci_map_single(sc->pdev, skb->data,
  37 +               pci_map_single(to_pci_dev(sc->dev), skb->data,
  38                                skb->len,
  39                                PCI_DMA_TODEVICE);
  40 -       if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
  41 +       if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev),
  42 +                                          bf->bf_buf_addr))) {
  43                 dev_kfree_skb_any(skb);
  44                 bf->bf_mpdu = NULL;
  45                 DPRINTF(sc, ATH_DBG_CONFIG,
  46 @@ -343,7 +344,7 @@ int ath_beacon_alloc(struct ath_softc *s
  47         bf = avp->av_bcbuf;
  48         if (bf->bf_mpdu != NULL) {
  49                 skb = (struct sk_buff *)bf->bf_mpdu;
  50 -               pci_unmap_single(sc->pdev, bf->bf_dmacontext,
  51 +               pci_unmap_single(to_pci_dev(sc->dev), bf->bf_dmacontext,
  52                                  skb->len,
  53                                  PCI_DMA_TODEVICE);
  54                 dev_kfree_skb_any(skb);
  55 @@ -402,10 +403,11 @@ int ath_beacon_alloc(struct ath_softc *s
  56
  57         bf->bf_mpdu = skb;
  58         bf->bf_buf_addr = bf->bf_dmacontext =
  59 -               pci_map_single(sc->pdev, skb->data,
  60 +               pci_map_single(to_pci_dev(sc->dev), skb->data,
  61                                skb->len,
  62                                PCI_DMA_TODEVICE);
  63 -       if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_buf_addr))) {
  64 +       if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev),
  65 +                                          bf->bf_buf_addr))) {
  66                 dev_kfree_skb_any(skb);
  67                 bf->bf_mpdu = NULL;
  68                 DPRINTF(sc, ATH_DBG_CONFIG,
  69 @@ -429,7 +431,8 @@ void ath_beacon_return(struct ath_softc
  70                 bf = avp->av_bcbuf;
  71                 if (bf->bf_mpdu != NULL) {
  72                         struct sk_buff *skb = (struct sk_buff *)bf->bf_mpdu;
  73 -                       pci_unmap_single(sc->pdev, bf->bf_dmacontext,
  74 +                       pci_unmap_single(to_pci_dev(sc->dev),
  75 +                                        bf->bf_dmacontext,
  76                                          skb->len,
  77                                          PCI_DMA_TODEVICE);
  78                         dev_kfree_skb_any(skb);
  79 --- a/drivers/net/wireless/ath9k/core.h
  80 +++ b/drivers/net/wireless/ath9k/core.h
  81 @@ -695,7 +695,7 @@ enum PROT_MODE {
  82
  83  struct ath_softc {
  84         struct ieee80211_hw *hw;
  85 -       struct pci_dev *pdev;
  86 +       struct device *dev;
  87         struct tasklet_struct intr_tq;
  88         struct tasklet_struct bcon_tasklet;
  89         struct ath_hal *sc_ah;
  90 --- a/drivers/net/wireless/ath9k/main.c
  91 +++ b/drivers/net/wireless/ath9k/main.c
  92 @@ -46,7 +46,8 @@ static void bus_read_cachesize(struct at
  93  {
  94         u8 u8tmp;
  95
  96 -       pci_read_config_byte(sc->pdev, PCI_CACHE_LINE_SIZE, (u8 *)&u8tmp);
  97 +       pci_read_config_byte(to_pci_dev(sc->dev), PCI_CACHE_LINE_SIZE,
  98 +                            (u8 *)&u8tmp);
  99         *csz = (int)u8tmp;
 100
 101         /*
 102 @@ -1269,11 +1270,11 @@ static int ath_start_rfkill_poll(struct
 103
 104                         /* Deinitialize the device */
 105                         ath_detach(sc);
 106 -                       if (sc->pdev->irq)
 107 -                               free_irq(sc->pdev->irq, sc);
 108 -                       pci_iounmap(sc->pdev, sc->mem);
 109 -                       pci_release_region(sc->pdev, 0);
 110 -                       pci_disable_device(sc->pdev);
 111 +                       if (to_pci_dev(sc->dev)->irq)
 112 +                               free_irq(to_pci_dev(sc->dev)->irq, sc);
 113 +                       pci_iounmap(to_pci_dev(sc->dev), sc->mem);
 114 +                       pci_release_region(to_pci_dev(sc->dev), 0);
 115 +                       pci_disable_device(to_pci_dev(sc->dev));
 116                         ieee80211_free_hw(sc->hw);
 117                         return -EIO;
 118                 } else {
 119 @@ -1716,7 +1717,7 @@ int ath_descdma_setup(struct ath_softc *
 120         }
 121
 122         /* allocate descriptors */
 123 -       dd->dd_desc = pci_alloc_consistent(sc->pdev,
 124 +       dd->dd_desc = pci_alloc_consistent(to_pci_dev(sc->dev),
 125                               dd->dd_desc_len,
 126                               &dd->dd_desc_paddr);
 127         if (dd->dd_desc == NULL) {
 128 @@ -1764,7 +1765,7 @@ int ath_descdma_setup(struct ath_softc *
 129         }
 130         return 0;
 131  fail2:
 132 -       pci_free_consistent(sc->pdev,
 133 +       pci_free_consistent(to_pci_dev(sc->dev),
 134                 dd->dd_desc_len, dd->dd_desc, dd->dd_desc_paddr);
 135  fail:
 136         memset(dd, 0, sizeof(*dd));
 137 @@ -1778,7 +1779,7 @@ void ath_descdma_cleanup(struct ath_soft
 138                          struct ath_descdma *dd,
 139                          struct list_head *head)
 140  {
 141 -       pci_free_consistent(sc->pdev,
 142 +       pci_free_consistent(to_pci_dev(sc->dev),
 143                 dd->dd_desc_len, dd->dd_desc, dd->dd_desc_paddr);
 144
 145         INIT_LIST_HEAD(head);
 146 @@ -2624,7 +2625,7 @@ static int ath_pci_probe(struct pci_dev
 147
 148         sc = hw->priv;
 149         sc->hw = hw;
 150 -       sc->pdev = pdev;
 151 +       sc->dev = &pdev->dev;
 152         sc->mem = mem;
 153
 154         if (ath_attach(id->device, sc) != 0) {
 155 --- a/drivers/net/wireless/ath9k/recv.c
 156 +++ b/drivers/net/wireless/ath9k/recv.c
 157 @@ -291,10 +291,11 @@ int ath_rx_init(struct ath_softc *sc, in
 158                         }
 159
 160                         bf->bf_mpdu = skb;
 161 -                       bf->bf_buf_addr = pci_map_single(sc->pdev, skb->data,
 162 +                       bf->bf_buf_addr = pci_map_single(to_pci_dev(sc->dev),
 163 +                                                        skb->data,
 164                                                          sc->rx.bufsize,
 165                                                          PCI_DMA_FROMDEVICE);
 166 -                       if (unlikely(pci_dma_mapping_error(sc->pdev,
 167 +                       if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev),
 168                                   bf->bf_buf_addr))) {
 169                                 dev_kfree_skb_any(skb);
 170                                 bf->bf_mpdu = NULL;
 171 @@ -524,7 +525,8 @@ int ath_rx_tasklet(struct ath_softc *sc,
 172                  * 1. accessing the frame
 173                  * 2. requeueing the same buffer to h/w
 174                  */
 175 -               pci_dma_sync_single_for_cpu(sc->pdev, bf->bf_buf_addr,
 176 +               pci_dma_sync_single_for_cpu(to_pci_dev(sc->dev),
 177 +                               bf->bf_buf_addr,
 178                                 sc->rx.bufsize,
 179                                 PCI_DMA_FROMDEVICE);
 180
 181 @@ -557,7 +559,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
 182                         goto requeue;
 183
 184                 /* Unmap the frame */
 185 -               pci_unmap_single(sc->pdev, bf->bf_buf_addr,
 186 +               pci_unmap_single(to_pci_dev(sc->dev), bf->bf_buf_addr,
 187                                  sc->rx.bufsize,
 188                                  PCI_DMA_FROMDEVICE);
 189
 190 @@ -605,10 +607,11 @@ int ath_rx_tasklet(struct ath_softc *sc,
 191
 192                 /* We will now give hardware our shiny new allocated skb */
 193                 bf->bf_mpdu = requeue_skb;
 194 -               bf->bf_buf_addr = pci_map_single(sc->pdev, requeue_skb->data,
 195 +               bf->bf_buf_addr = pci_map_single(to_pci_dev(sc->dev),
 196 +                                        requeue_skb->data,
 197                                          sc->rx.bufsize,
 198                                          PCI_DMA_FROMDEVICE);
 199 -               if (unlikely(pci_dma_mapping_error(sc->pdev,
 200 +               if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev),
 201                           bf->bf_buf_addr))) {
 202                         dev_kfree_skb_any(requeue_skb);
 203                         bf->bf_mpdu = NULL;
 204 --- a/drivers/net/wireless/ath9k/xmit.c
 205 +++ b/drivers/net/wireless/ath9k/xmit.c
 206 @@ -340,7 +340,7 @@ static void ath_tx_complete_buf(struct a
 207         }
 208
 209         /* Unmap this frame */
 210 -       pci_unmap_single(sc->pdev,
 211 +       pci_unmap_single(to_pci_dev(sc->dev),
 212                          bf->bf_dmacontext,
 213                          skb->len,
 214                          PCI_DMA_TODEVICE);
 215 @@ -1716,9 +1716,10 @@ static int ath_tx_setup_buffer(struct at
 216         /* DMA setup */
 217         bf->bf_mpdu = skb;
 218
 219 -       bf->bf_dmacontext = pci_map_single(sc->pdev, skb->data,
 220 +       bf->bf_dmacontext = pci_map_single(to_pci_dev(sc->dev), skb->data,
 221                                            skb->len, PCI_DMA_TODEVICE);
 222 -       if (unlikely(pci_dma_mapping_error(sc->pdev, bf->bf_dmacontext))) {
 223 +       if (unlikely(pci_dma_mapping_error(to_pci_dev(sc->dev),
 224 +                                          bf->bf_dmacontext))) {
 225                 bf->bf_mpdu = NULL;
 226                 DPRINTF(sc, ATH_DBG_CONFIG,
 227                         "pci_dma_mapping_error() on TX\n");