diff options
4 files changed, 15 insertions, 11 deletions
diff --git a/kernel-devel/module-basics/pres_module-basics_en.tex b/kernel-devel/module-basics/pres_module-basics_en.tex index 9f3c8c4..9827d3f 100644 --- a/kernel-devel/module-basics/pres_module-basics_en.tex +++ b/kernel-devel/module-basics/pres_module-basics_en.tex @@ -209,9 +209,10 @@ module_exit(vain_pci_exit); \begin{tiny} \begin{lstlisting}[frame=trBL] |static struct pci_device_id vain_pci_ids[] = { - {PCI_VENDOR_ID_ILLEGAL_VENDOR, PCI_DEVICE_ID_ILLEGAL_VENDOR_DEVICE, + {PCI_VENDOR_ID_ILLEGAL_VENDOR, + PCI_DEVICE_ID_ILLEGAL_VENDOR_DEVICE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - {0, } + { /* end of table */ } };| \end{lstlisting} \end{tiny} @@ -416,7 +417,8 @@ static void vain_plat_exit(void) res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - mem = request_mem_region(res->start, resource_size(res), pdev->name); + mem = request_mem_region(res->start, resource_size(res), + pdev->name); info->base = ioremap(res->start, resource_size(res)); diff --git a/kernel-devel/module-basics/vain_pci/vain_pci_1.c b/kernel-devel/module-basics/vain_pci/vain_pci_1.c index d60b230..d920bb0 100644 --- a/kernel-devel/module-basics/vain_pci/vain_pci_1.c +++ b/kernel-devel/module-basics/vain_pci/vain_pci_1.c @@ -12,8 +12,9 @@ struct vain_pci_info { }; static struct pci_device_id vain_pci_ids[] __devinitdata = { - {PCI_VENDOR_ID_ILLEGAL_VENDOR, PCI_DEVICE_ID_ILLEGAL_VENDOR_DEVICE, + {PCI_VENDOR_ID_ILLEGAL_VENDOR, + PCI_DEVICE_ID_ILLEGAL_VENDOR_DEVICE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, - {0, } + { /* end of table */ } }; MODULE_DEVICE_TABLE(pci, vain_pci_ids); diff --git a/kernel-devel/module-basics/vain_plat/vain_plat_2.c b/kernel-devel/module-basics/vain_plat/vain_plat_2.c index 9c5a980..9aa43e0 100644 --- a/kernel-devel/module-basics/vain_plat/vain_plat_2.c +++ b/kernel-devel/module-basics/vain_plat/vain_plat_2.c @@ -17,9 +17,3 @@ static int __devinit vain_plat_probe(struct platform_device *pdev) err = -ENOENT; goto err_free; } - - mem = request_mem_region(res->start, resource_size(res), pdev->name); - if (!mem) { - err = -EBUSY; - goto err_free; - } diff --git a/kernel-devel/module-basics/vain_plat/vain_plat_3.c b/kernel-devel/module-basics/vain_plat/vain_plat_3.c index 8ec839c..7fb0fc2 100644 --- a/kernel-devel/module-basics/vain_plat/vain_plat_3.c +++ b/kernel-devel/module-basics/vain_plat/vain_plat_3.c @@ -1,3 +1,10 @@ + mem = request_mem_region(res->start, resource_size(res), + pdev->name); + if (!mem) { + err = -EBUSY; + goto err_free; + } + info->base = ioremap(res->start, resource_size(res)); if (!info->base) { dev_err(&pdev->dev, "Unable to map card MMIO\n"); |