Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 4b9d0d3b81ec0900971cbe8aba8ba0ae9c08a087

Authored by Greg Kroah-Hartman
1 parent 2bdf914915
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

eisa: remove driver_data direct access of struct device 

In the near future, the driver core is going to not allow direct access
to the driver_data pointer in struct device.  Instead, the functions
dev_get_drvdata() and dev_set_drvdata() should be used.  These functions
have been around since the beginning, so are backwards compatible with
all older kernel versions.


Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 3 changed files with 4 additions and 4 deletions Side-by-side Diff

drivers/eisa/pci_eisa.c
Diff comments   View file @ 4b9d0d3
... ... @@ -31,11 +31,11 @@
31 31 }
32 32  
33 33 pci_eisa_root.dev = &pdev->dev;
34   - pci_eisa_root.dev->driver_data = &pci_eisa_root;
35 34 pci_eisa_root.res = pdev->bus->resource[0];
36 35 pci_eisa_root.bus_base_addr = pdev->bus->resource[0]->start;
37 36 pci_eisa_root.slots = EISA_MAX_SLOTS;
38 37 pci_eisa_root.dma_mask = pdev->dma_mask;
  38 + dev_set_drvdata(pci_eisa_root.dev, &pci_eisa_root);
39 39  
40 40 if (eisa_root_register (&pci_eisa_root)) {
41 41 printk (KERN_ERR "pci_eisa : Could not register EISA root\n");
drivers/eisa/virtual_root.c
Diff comments   View file @ 4b9d0d3
... ... @@ -57,7 +57,7 @@
57 57  
58 58 eisa_bus_root.force_probe = force_probe;
59 59  
60   - eisa_root_dev.dev.driver_data = &eisa_bus_root;
  60 + dev_set_drvdata(&eisa_root_dev.dev, &eisa_bus_root);
61 61  
62 62 if (eisa_root_register (&eisa_bus_root)) {
63 63 /* A real bridge may have been registered before
include/linux/eisa.h
Diff comments   View file @ 4b9d0d3
... ... @@ -78,12 +78,12 @@
78 78 /* Mimics pci.h... */
79 79 static inline void *eisa_get_drvdata (struct eisa_device *edev)
80 80 {
81   - return edev->dev.driver_data;
  81 + return dev_get_drvdata(&edev->dev);
82 82 }
83 83  
84 84 static inline void eisa_set_drvdata (struct eisa_device *edev, void *data)
85 85 {
86   - edev->dev.driver_data = data;
  86 + dev_set_drvdata(&edev->dev, data);
87 87 }
88 88  
89 89 /* The EISA root device. There's rumours about machines with multiple