From: Jesse Huang <[email protected]>
Add "0," and "NULL," to sundance_pci_tbl and pci_id_table.
Change Logs:
Add "0," and "NULL," to sundance_pci_tbl and pci_id_table.
---
drivers/net/sundance.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
9ef94f8b85a0070e49bb1883a9f124be1711761d
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index ac17377..eb81d91 100755
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -21,8 +21,8 @@
*/
#define DRV_NAME "sundance"
-#define DRV_VERSION "1.1"
-#define DRV_RELDATE "27-Jun-2006"
+#define DRV_VERSION "1.2"
+#define DRV_RELDATE "03-Aug-2006"
/* The user-configurable values.
@@ -212,7 +212,7 @@ static const struct pci_device_id sundan
{ 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
{ 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
{ 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
- { }
+ { 0,}
};
MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
@@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_t
{"D-Link DL10050-based FAST Ethernet Adapter"},
{"Sundance Technology Alta"},
{"IC Plus Corporation IP100A FAST Ethernet Adapter"},
- { } /* terminate list. */
+ { NULL,} /* terminate list. */
};
/* This driver was written to use PCI memory space, however x86-oriented
--
1.3.GIT
Jesse Huang wrote:
> @@ -212,7 +212,7 @@ static const struct pci_device_id sundan
> { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
> { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
> { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
> - { }
> + { 0,}
> };
> MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
>
> @@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_t
> {"D-Link DL10050-based FAST Ethernet Adapter"},
> {"Sundance Technology Alta"},
> {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
> - { } /* terminate list. */
> + { NULL,} /* terminate list. */
NAK.
An empty array element "{ }" implies NULL. It is the kernel standard to
prefer "{ }" over an explicit initialization. Looks cleaner.
Jeff
On Thu, Aug 17, 2006 at 03:00:47PM -0400, Jesse Huang wrote:
> Add "0," and "NULL," to sundance_pci_tbl and pci_id_table.
> @@ -212,7 +212,7 @@ static const struct pci_device_id sundan
> { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
> { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
> { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
> - { }
> + { 0,}
> };
> MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
>
> @@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_t
> {"D-Link DL10050-based FAST Ethernet Adapter"},
> {"Sundance Technology Alta"},
> {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
> - { } /* terminate list. */
> + { NULL,} /* terminate list. */
They are already properly terminated. You don't have to do anything.
Hi Jeff:
Sorry for that. I will remove those. Am I need to resent all of those
patch or send all in one patch?
Jesse Huang.
----- Original Message -----
From: "Jeff Garzik" <[email protected]>
To: "Jesse Huang" <[email protected]>
Cc: <[email protected]>; <[email protected]>;
<[email protected]>
Sent: Thursday, August 17, 2006 10:45 PM
Subject: Re: [PATCH 1/6] IP100A, add end of pci id table
Jesse Huang wrote:
> @@ -212,7 +212,7 @@ static const struct pci_device_id sundan
> { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
> { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
> { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
> - { }
> + { 0,}
> };
> MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
>
> @@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_t
> {"D-Link DL10050-based FAST Ethernet Adapter"},
> {"Sundance Technology Alta"},
> {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
> - { } /* terminate list. */
> + { NULL,} /* terminate list. */
NAK.
An empty array element "{ }" implies NULL. It is the kernel standard to
prefer "{ }" over an explicit initialization. Looks cleaner.
Jeff
Hi Alexey:
I will remove that. Thanks for that.
Jesse Huang
----- Original Message -----
From: "Alexey Dobriyan" <[email protected]>
To: "Jesse Huang" <[email protected]>
Cc: <[email protected]>; <[email protected]>;
<[email protected]>; <[email protected]>
Sent: Thursday, August 17, 2006 11:19 PM
Subject: Re: [PATCH 1/6] IP100A, add end of pci id table
On Thu, Aug 17, 2006 at 03:00:47PM -0400, Jesse Huang wrote:
> Add "0," and "NULL," to sundance_pci_tbl and pci_id_table.
> @@ -212,7 +212,7 @@ static const struct pci_device_id sundan
> { 0x1186, 0x1002, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
> { 0x13F0, 0x0201, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 5 },
> { 0x13F0, 0x0200, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 6 },
> - { }
> + { 0,}
> };
> MODULE_DEVICE_TABLE(pci, sundance_pci_tbl);
>
> @@ -231,7 +231,7 @@ static const struct pci_id_info pci_id_t
> {"D-Link DL10050-based FAST Ethernet Adapter"},
> {"Sundance Technology Alta"},
> {"IC Plus Corporation IP100A FAST Ethernet Adapter"},
> - { } /* terminate list. */
> + { NULL,} /* terminate list. */
They are already properly terminated. You don't have to do anything.
Jesse Huang wrote:
> Hi Jeff:
>
> Sorry for that. I will remove those. Am I need to resent all of those
> patch or send all in one patch?
Normally, when I merged a patch, you will receive a one-word reply
"applied" or "merged". Or for a series of patches, "applies patches 1-6".
For this series of patches, you will need to resend the entire patchset,
modified with the comments so far.
It is quite normal for some patchsets to undergo several iterations
before being merged, when engineering review highlights issues.
Thanks and regards,
Jeff
Hi Jeff:
Ok, I see. I will resend all of the patches after I finish modify. Thanks.
Jesse
----- Original Message -----
From: "Jeff Garzik" <[email protected]>
To: "Jesse Huang" <[email protected]>
Cc: <[email protected]>; <[email protected]>;
<[email protected]>
Sent: Friday, August 18, 2006 7:09 PM
Subject: Re: [PATCH 1/6] IP100A, add end of pci id table
Jesse Huang wrote:
> Hi Jeff:
>
> Sorry for that. I will remove those. Am I need to resent all of those
> patch or send all in one patch?
Normally, when I merged a patch, you will receive a one-word reply
"applied" or "merged". Or for a series of patches, "applies patches 1-6".
For this series of patches, you will need to resend the entire patchset,
modified with the comments so far.
It is quite normal for some patchsets to undergo several iterations
before being merged, when engineering review highlights issues.
Thanks and regards,
Jeff