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

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