| Message ID | 20200917071042.1909191-1-liushixin2@huawei.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [-next] PCI/IOV: use module_pci_driver to simplify the code | expand |
[+cc Alexander] On Thu, Sep 17, 2020 at 03:10:42PM +0800, Liu Shixin wrote: > Use the module_pci_driver() macro to make the code simpler > by eliminating module_init and module_exit calls. > > Signed-off-by: Liu Shixin <liushixin2@huawei.com> Applied to pci/misc for v5.10, thanks! > --- > drivers/pci/pci-pf-stub.c | 14 +------------- > 1 file changed, 1 insertion(+), 13 deletions(-) > > diff --git a/drivers/pci/pci-pf-stub.c b/drivers/pci/pci-pf-stub.c > index a0b2bd6c918a..45855a5e9fca 100644 > --- a/drivers/pci/pci-pf-stub.c > +++ b/drivers/pci/pci-pf-stub.c > @@ -37,18 +37,6 @@ static struct pci_driver pf_stub_driver = { > .probe = pci_pf_stub_probe, > .sriov_configure = pci_sriov_configure_simple, > }; > - > -static int __init pci_pf_stub_init(void) > -{ > - return pci_register_driver(&pf_stub_driver); > -} > - > -static void __exit pci_pf_stub_exit(void) > -{ > - pci_unregister_driver(&pf_stub_driver); > -} > - > -module_init(pci_pf_stub_init); > -module_exit(pci_pf_stub_exit); > +module_pci_driver(pf_stub_driver); > > MODULE_LICENSE("GPL"); > -- > 2.25.1 >
On Thu, Sep 17, 2020 at 9:56 AM Bjorn Helgaas <helgaas@kernel.org> wrote: > > [+cc Alexander] > > On Thu, Sep 17, 2020 at 03:10:42PM +0800, Liu Shixin wrote: > > Use the module_pci_driver() macro to make the code simpler > > by eliminating module_init and module_exit calls. > > > > Signed-off-by: Liu Shixin <liushixin2@huawei.com> > > Applied to pci/misc for v5.10, thanks! The code below seems pretty straight forward. Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> > > --- > > drivers/pci/pci-pf-stub.c | 14 +------------- > > 1 file changed, 1 insertion(+), 13 deletions(-) > > > > diff --git a/drivers/pci/pci-pf-stub.c b/drivers/pci/pci-pf-stub.c > > index a0b2bd6c918a..45855a5e9fca 100644 > > --- a/drivers/pci/pci-pf-stub.c > > +++ b/drivers/pci/pci-pf-stub.c > > @@ -37,18 +37,6 @@ static struct pci_driver pf_stub_driver = { > > .probe = pci_pf_stub_probe, > > .sriov_configure = pci_sriov_configure_simple, > > }; > > - > > -static int __init pci_pf_stub_init(void) > > -{ > > - return pci_register_driver(&pf_stub_driver); > > -} > > - > > -static void __exit pci_pf_stub_exit(void) > > -{ > > - pci_unregister_driver(&pf_stub_driver); > > -} > > - > > -module_init(pci_pf_stub_init); > > -module_exit(pci_pf_stub_exit); > > +module_pci_driver(pf_stub_driver); > > > > MODULE_LICENSE("GPL"); > > -- > > 2.25.1 > >
On Thu, Sep 17, 2020 at 10:19:13AM -0700, Alexander Duyck wrote: > On Thu, Sep 17, 2020 at 9:56 AM Bjorn Helgaas <helgaas@kernel.org> wrote: > > > > [+cc Alexander] > > > > On Thu, Sep 17, 2020 at 03:10:42PM +0800, Liu Shixin wrote: > > > Use the module_pci_driver() macro to make the code simpler > > > by eliminating module_init and module_exit calls. > > > > > > Signed-off-by: Liu Shixin <liushixin2@huawei.com> > > > > Applied to pci/misc for v5.10, thanks! > > The code below seems pretty straight forward. > > Acked-by: Alexander Duyck <alexander.h.duyck@linux.intel.com> Thanks a lot for taking a look, Alexander, I added your ack.
diff --git a/drivers/pci/pci-pf-stub.c b/drivers/pci/pci-pf-stub.c index a0b2bd6c918a..45855a5e9fca 100644 --- a/drivers/pci/pci-pf-stub.c +++ b/drivers/pci/pci-pf-stub.c @@ -37,18 +37,6 @@ static struct pci_driver pf_stub_driver = { .probe = pci_pf_stub_probe, .sriov_configure = pci_sriov_configure_simple, }; - -static int __init pci_pf_stub_init(void) -{ - return pci_register_driver(&pf_stub_driver); -} - -static void __exit pci_pf_stub_exit(void) -{ - pci_unregister_driver(&pf_stub_driver); -} - -module_init(pci_pf_stub_init); -module_exit(pci_pf_stub_exit); +module_pci_driver(pf_stub_driver); MODULE_LICENSE("GPL");
Use the module_pci_driver() macro to make the code simpler by eliminating module_init and module_exit calls. Signed-off-by: Liu Shixin <liushixin2@huawei.com> --- drivers/pci/pci-pf-stub.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-)