Subject: [merged] drivers-media-pci-pluto2-pluto2-convert-to-module_pci_driver.patch removed from -mm tree
To: clbchenlibo.chen@xxxxxxxxxx,libo.chen@xxxxxxxxxx,mchehab@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Tue, 25 Jun 2013 12:22:50 -0700
The patch titled
Subject: drivers/media/pci/pluto2/pluto2.c: convert to module_pci_driver
has been removed from the -mm tree. Its filename was
drivers-media-pci-pluto2-pluto2-convert-to-module_pci_driver.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Libo Chen <clbchenlibo.chen@xxxxxxxxxx>
Subject: drivers/media/pci/pluto2/pluto2.c: convert to module_pci_driver
Signed-off-by: Libo Chen <libo.chen@xxxxxxxxxx>
Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/media/pci/pluto2/pluto2.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff -puN drivers/media/pci/pluto2/pluto2.c~drivers-media-pci-pluto2-pluto2-convert-to-module_pci_driver drivers/media/pci/pluto2/pluto2.c
--- a/drivers/media/pci/pluto2/pluto2.c~drivers-media-pci-pluto2-pluto2-convert-to-module_pci_driver
+++ a/drivers/media/pci/pluto2/pluto2.c
@@ -796,18 +796,7 @@ static struct pci_driver pluto2_driver =
.remove = pluto2_remove,
};
-static int __init pluto2_init(void)
-{
- return pci_register_driver(&pluto2_driver);
-}
-
-static void __exit pluto2_exit(void)
-{
- pci_unregister_driver(&pluto2_driver);
-}
-
-module_init(pluto2_init);
-module_exit(pluto2_exit);
+module_pci_driver(pluto2_driver);
MODULE_AUTHOR("Andreas Oberritter <obi@xxxxxxxxxxx>");
MODULE_DESCRIPTION("Pluto2 driver");
_
Patches currently in -mm which might be from clbchenlibo.chen@xxxxxxxxxx are
linux-next.patch
drivers-platform-x86-intel_ips-convert-to-module_pci_driver.patch
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths.patch
drivers-iommu-msm_iommu_devc-fix-leak-and-clean-up-error-paths-fix.patch
drivers-ide-delkin_cb-convert-to-module_pci_driver.patch
drivers-atm-he-convert-to-module_pci_driver.patch
drivers-scsi-a100u2w-convert-to-module_pci_driver.patch
drivers-scsi-dc395x-convert-to-module_pci_driver.patch
drivers-scsi-dmx3191d-convert-to-module_pci_driver.patch
drivers-scsi-initio-convert-to-module_pci_driver.patch
drivers-scsi-mvumi-convert-to-module_pci_driver.patch
drivers-net-irda-donauboe-convert-to-module_pci_driver.patch
drivers-cdrom-gdromc-fix-device-number-leak.patch
drivers-memstick-host-r592-convert-to-module_pci_driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
