Update compat-wireless to 2.6.36-5-spn

chromeos/compat-wireless/drivers/net/wireless/adm8211.c

 
 /*
  * Linux device driver for ADMtek ADM8211 (IEEE 802.11b MAC/BBP)
  *
  * Copyright (c) 2003, Jouni Malinen <j@w1.fi>
  * Copyright (c) 2004-2007, Michael Wu <flamingice@sourmilk.net>
  * Some parts copyright (c) 2003 by David Young <dyoung@pobox.com>
  * and used with permission.
  *
  * Much thanks to Infineon-ADMtek for their support of this driver.
@@ skipping 714 matching lines @@
         adm8211_write_bbp(dev, RF3000_LOW_GAIN_CALIB, lpf_cutoff);
         adm8211_write_bbp(dev, RF3000_HIGH_GAIN_CALIB, lnags_thresh);
         adm8211_write_bbp(dev, 0x1c, priv->pdev->revision == ADM8211_REV_BA ?
                                      priv->eeprom->cr28 : 0);
         adm8211_write_bbp(dev, 0x1d, priv->eeprom->cr29);
 
         ADM8211_CSR_WRITE(SYNRF, 0);
 
         /* Nothing to do for ADMtek BBP */
         } else if (priv->bbp_type != ADM8211_TYPE_ADMTEK)
-                wiphy_debug(dev->wiphy, "unsupported bbp type %d\n",
+                wiphy_debug(dev->wiphy, "unsupported BBP type %d\n",
                             priv->bbp_type);
 
         ADM8211_RESTORE();
 
         /* update current channel for adhoc (and maybe AP mode) */
         reg = ADM8211_CSR_READ(CAP0);
         reg &= ~0xF;
         reg |= chan;
         ADM8211_CSR_WRITE(CAP0, reg);
 
@@ skipping 279 matching lines @@
 
                 case ADM8211_RFMD2948:
                         break;
 
                 default:
                         wiphy_debug(dev->wiphy, "unsupported transceiver %d\n",
                                     priv->transceiver_type);
                         break;
                 }
         } else
-                wiphy_debug(dev->wiphy, "unsupported bbp %d\n", priv->bbp_type);
+                wiphy_debug(dev->wiphy, "unsupported BBP %d\n", priv->bbp_type);
 
         ADM8211_CSR_WRITE(SYNRF, 0);
 
         /* Set RF CAL control source to MAC control */
         reg = ADM8211_CSR_READ(SYNCTL);
         reg |= ADM8211_SYNCTL_SELCAL;
         ADM8211_CSR_WRITE(SYNCTL, reg);
 
         return 0;
 }
@@ skipping 490 matching lines @@
                 goto fail;
         }
 
         /* Init hardware */
         adm8211_hw_init(dev);
         adm8211_rf_set_channel(dev, priv->channel);
 
         retval = request_irq(priv->pdev->irq, adm8211_interrupt,
                              IRQF_SHARED, "adm8211", dev);
         if (retval) {
-                wiphy_err(dev->wiphy, "failed to register irq handler\n");
+                wiphy_err(dev->wiphy, "failed to register IRQ handler\n");
                 goto fail;
         }
 
         ADM8211_CSR_WRITE(IER, ADM8211_IER_NIE | ADM8211_IER_AIE |
                                ADM8211_IER_RCIE | ADM8211_IER_TCIE |
                                ADM8211_IER_TDUIE | ADM8211_IER_GPTIE);
         priv->mode = NL80211_IFTYPE_MONITOR;
         adm8211_update_mode(dev);
         ADM8211_CSR_WRITE(RDR, 0);
 
@@ skipping 356 matching lines @@
 
         dev->wiphy->bands[IEEE80211_BAND_2GHZ] = &priv->band;
 
         err = ieee80211_register_hw(dev);
         if (err) {
                 printk(KERN_ERR "%s (adm8211): Cannot register device\n",
                        pci_name(pdev));
                 goto err_free_eeprom;
         }
 
-        wiphy_info(dev->wiphy, "hwaddr %pm, rev 0x%02x\n",
+        wiphy_info(dev->wiphy, "hwaddr %pM, Rev 0x%02x\n",
                    dev->wiphy->perm_addr, pdev->revision);
 
         return 0;
 
  err_free_eeprom:
         kfree(priv->eeprom);
 
  err_free_desc:
         pci_free_consistent(pdev,
                             sizeof(struct adm8211_desc) * priv->rx_ring_size +
@@ skipping 83 matching lines @@
 
 
 static void __exit adm8211_exit(void)
 {
         pci_unregister_driver(&adm8211_driver);
 }
 
 
 module_init(adm8211_init);
 module_exit(adm8211_exit);