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