package/acx-mac80211/patches/002-remove-usage-of__dev.patch

   1 --- a/mem.c
   2 +++ b/mem.c
   3 @@ -2002,7 +2002,7 @@ int acx100mem_ioctl_set_phy_amp_bias(str
   4   *       configuration
   5   * id  - ptr to the device id entry that matched this device
   6   */
   7 -static int __devinit acxmem_probe(struct platform_device *pdev)
   8 +static int acxmem_probe(struct platform_device *pdev)
   9  {
  10         acx_device_t *adev = NULL;
  11         const char *chip_name;
  12 @@ -2268,7 +2268,7 @@ done:
  13   * pdev - ptr to PCI device structure containing info about pci
  14   * configuration
  15   */
  16 -static int __devexit acxmem_remove(struct platform_device *pdev)
  17 +static int acxmem_remove(struct platform_device *pdev)
  18  {
  19         struct ieee80211_hw *hw = (struct ieee80211_hw *)
  20                 platform_get_drvdata(pdev);
  21 @@ -2470,7 +2470,7 @@ static struct platform_driver acxmem_dri
  22                 .name = "acx-mem",
  23         },
  24         .probe = acxmem_probe,
  25 -       .remove = __devexit_p(acxmem_remove),
  26 +       .remove = acxmem_remove,
  27
  28  #ifdef CONFIG_PM
  29         .suspend = acxmem_e_suspend,
  30 --- a/pci.c
  31 +++ b/pci.c
  32 @@ -982,7 +982,7 @@ int acx100pci_ioctl_set_phy_amp_bias(str
  33   * id  - ptr to the device id entry that matched this device
  34   */
  35  #ifdef CONFIG_PCI
  36 -static int __devinit acxpci_probe(struct pci_dev *pdev,
  37 +static int acxpci_probe(struct pci_dev *pdev,
  38                                 const struct pci_device_id *id)
  39  {
  40         acx111_ie_configoption_t co;
  41 @@ -1346,7 +1346,7 @@ done:
  42   *
  43   * pdev - ptr to PCI device structure containing info about pci configuration
  44   */
  45 -static void __devexit acxpci_remove(struct pci_dev *pdev)
  46 +static void acxpci_remove(struct pci_dev *pdev)
  47  {
  48         struct ieee80211_hw *hw
  49                 = (struct ieee80211_hw *) pci_get_drvdata(pdev);
  50 @@ -1537,7 +1537,7 @@ static int acxpci_e_resume(struct pci_de
  51   */
  52
  53  #if 0 // use later ?
  54 -static struct acxpci_device_info acxpci_info_tbl[] __devinitdata = {
  55 +static struct acxpci_device_info acxpci_info_tbl[] = {
  56          [0] = {
  57                  .part_name      = "acx111",
  58                  .helper_image   = "tiacx1111r16", // probly wrong !!
  59 @@ -1564,7 +1564,7 @@ static struct pci_driver acxpci_driver =
  60         .name           = "acx_pci",
  61         .id_table       = acxpci_id_tbl,
  62         .probe          = acxpci_probe,
  63 -       .remove         = __devexit_p(acxpci_remove),
  64 +       .remove         = acxpci_remove,
  65  #ifdef CONFIG_PM
  66         .suspend        = acxpci_e_suspend,
  67         .resume         = acxpci_e_resume
  68 @@ -1662,7 +1662,7 @@ static struct vlynq_device_id acx_vlynq_
  69  };
  70
  71
  72 -static __devinit int vlynq_probe(struct vlynq_device *vdev,
  73 +static int vlynq_probe(struct vlynq_device *vdev,
  74                                  struct vlynq_device_id *id)
  75  {
  76         int result = -EIO, i;
  77 @@ -1971,7 +1971,7 @@ static struct vlynq_driver vlynq_acx = {
  78         .name = "acx_vlynq",
  79         .id_table = acx_vlynq_id,
  80         .probe = vlynq_probe,
  81 -       .remove = __devexit_p(vlynq_remove),
  82 +       .remove = vlynq_remove,
  83  };
  84  #endif /* CONFIG_VLYNQ */
  85