[PATCH 2/2] NetXen: Use pci_register_driver() instead of pci_module_init() in init_module

[PATCH 2/2] NetXen: Use pci_register_driver() instead of pci_module_init() in init_module

[Amit S. Kale]

I am extremely sorry for sending this patch with wrong subject line before this.
Now i am resending the patch with correct line.

Thanks,
--Amit

This will use pci_register_driver() instead of pci_module_init().

Signed-off-by: Amit S. Kale <amitkale@netxen.com>
Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>

---
 netxen_nic.h      |    2 +-
 netxen_nic_main.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 663fa2f..59324b1 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -63,7 +63,7 @@ #include <asm/pgtable.h>
 
 #include "netxen_nic_hw.h"
 
-#define NETXEN_NIC_BUILD_NO     "1"
+#define NETXEN_NIC_BUILD_NO     "2"
 #define _NETXEN_NIC_LINUX_MAJOR 3
 #define _NETXEN_NIC_LINUX_MINOR 3
 #define _NETXEN_NIC_LINUX_SUBVERSION 3
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 8a5792f..96e1bee 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1144,7 +1144,7 @@ static int __init netxen_init_module(voi
 	if ((netxen_workq = create_singlethread_workqueue("netxen")) == 0)
 		return -ENOMEM;
 
-	return pci_module_init(&netxen_driver);
+	return pci_register_driver(&netxen_driver);
 }
 
 module_init(netxen_init_module);

Re: [PATCH 2/2] NetXen: Use pci_register_driver() instead of pci_module_init() in init_module

[Jeff Garzik]

Amit S. Kale wrote:
> I am extremely sorry for sending this patch with wrong subject line before this.
> Now i am resending the patch with correct line.
> 
> Thanks,
> --Amit

Please include comments such as the above quoted /below/ the "---" 
terminator.

The git merge scripts copy everything preceding "---" directly into the 
kernel changelog.  Everything following "---", except the patch itself, 
is ignored by the automated tools.

	Jeff




> This will use pci_register_driver() instead of pci_module_init().
> 
> Signed-off-by: Amit S. Kale <amitkale@netxen.com>
> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
> 
> ---
>  netxen_nic.h      |    2 +-
>  netxen_nic_main.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
> index 663fa2f..59324b1 100644
> --- a/drivers/net/netxen/netxen_nic.h
> +++ b/drivers/net/netxen/netxen_nic.h
> @@ -63,7 +63,7 @@ #include <asm/pgtable.h>
>  
>  #include "netxen_nic_hw.h"
>  
> -#define NETXEN_NIC_BUILD_NO     "1"
> +#define NETXEN_NIC_BUILD_NO     "2"

Please remove NETXEN_NIC_BUILD_NO, it is incompatible with Linux kernel 
development.  People who modify the kernel API, and then update drivers 
for that new API, will likely not bother with updating this variable, 
making it largely useless in practice.

	Jeff