package/system/ep80579-drivers/patches/230-can_remove_driver_data_direct_access.patch

   1 --- a/Embedded/src/CAN/can_main.c
   2 +++ b/Embedded/src/CAN/can_main.c
   3 @@ -214,8 +214,8 @@ int can_pci_probe(struct pci_dev *dev, c
   4      spin_lock_init(&(g_can_os[can_num].int_spinlock));\r
   5      spin_lock_init(&(g_can_os[can_num].open_spinlock));\r
   6  \r
   7 -    dev->dev.driver_data = (void *) &(g_can_os[can_num]);\r
   8 -    if (!dev->dev.driver_data)\r
   9 +    dev_set_drvdata(&dev->dev, (void *) &(g_can_os[can_num]));\r
  10 +    if (!dev_get_drvdata(&dev->dev))\r
  11      {\r
  12          printk("Couldn't create CAN device %d. Exiting.\n",\r
  13              dev->device);\r
  14 @@ -237,7 +237,7 @@ int can_pci_probe(struct pci_dev *dev, c
  15   *****************************************************************************/\r
  16  void can_pci_remove(struct pci_dev *dev)\r
  17  {\r
  18 -    can_os_t *can_os = dev->dev.driver_data;\r
  19 +    can_os_t *can_os = dev_get_drvdata(&dev->dev);\r
  20  \r
  21      iounmap(can_os->pci_remap);\r
  22      icp_can_destroy(can_os->can);\r
  23 @@ -251,7 +251,7 @@ int can_pci_suspend(struct pci_dev *dev,
  24  {\r
  25      unsigned int i;\r
  26      unsigned int int_status;\r
  27 -    can_os_t *can_os = dev->dev.driver_data;\r
  28 +    can_os_t *can_os = dev_get_drvdata(&dev->dev);\r
  29      int err;\r
  30  \r
  31         /* Indicate that we are suspending */\r
  32 @@ -322,7 +322,7 @@ int can_pci_suspend(struct pci_dev *dev,
  33  int can_pci_resume(struct pci_dev *dev)\r
  34  {\r
  35      unsigned int i;\r
  36 -    can_os_t *can_os = dev->dev.driver_data;\r
  37 +    can_os_t *can_os = dev_get_drvdata(&dev->dev);\r
  38  \r
  39         /* Restore PCI CFG space */\r
  40         pci_restore_state(dev);\r