[PATCH v10 1/9] can: peak_usb: use ARRAY_SIZE instead off NULL termination for peak_usb_adapters_list

[PATCH v10 1/9] can: peak_usb: use ARRAY_SIZE instead off NULL termination for peak_usb_adapters_list

[Marc Kleine-Budde]

This patch converts the list "static struct peak_usb_adapter
*peak_usb_adapters_list[]" to be used with ARRAY_SIZE not with a NULL
termination, as the size is known during compile time.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 drivers/net/can/usb/peak_usb/pcan_usb_core.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
index c62f48a1161d..26c0cc3ce3b2 100644
--- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c
@@ -46,7 +46,6 @@ MODULE_DEVICE_TABLE(usb, peak_usb_table);
 static struct peak_usb_adapter *peak_usb_adapters_list[] = {
 	&pcan_usb,
 	&pcan_usb_pro,
-	NULL,
 };
 
 /*
@@ -857,17 +856,18 @@ static int peak_usb_probe(struct usb_interface *intf,
 {
 	struct usb_device *usb_dev = interface_to_usbdev(intf);
 	const u16 usb_id_product = le16_to_cpu(usb_dev->descriptor.idProduct);
-	struct peak_usb_adapter *peak_usb_adapter, **pp;
+	struct peak_usb_adapter *peak_usb_adapter = NULL;
 	int i, err = -ENOMEM;
 
 	usb_dev = interface_to_usbdev(intf);
 
 	/* get corresponding PCAN-USB adapter */
-	for (pp = peak_usb_adapters_list; *pp; pp++)
-		if ((*pp)->device_id == usb_id_product)
+	for (i = 0; i < ARRAY_SIZE(peak_usb_adapters_list); i++)
+		if (peak_usb_adapters_list[i]->device_id == usb_id_product) {
+			peak_usb_adapter = peak_usb_adapters_list[i];
 			break;
+		}
 
-	peak_usb_adapter = *pp;
 	if (!peak_usb_adapter) {
 		/* should never come except device_id bad usage in this file */
 		pr_err("%s: didn't find device id. 0x%x in devices list\n",
-- 
2.1.4

Re: [PATCH v10 1/9] can: peak_usb: use ARRAY_SIZE instead off NULL termination for peak_usb_adapters_list

[Stéphane Grosjean]

[-- Attachment #1: Type: text/plain, Size: 1898 bytes --]

Hi Mark,

You've got my Ack for this patch.

Thanks,

Stéphane.Le 27 janv. 2015 17:41, Marc Kleine-Budde <mkl@pengutronix.de> a écrit :
>
> This patch converts the list "static struct peak_usb_adapter 
> *peak_usb_adapters_list[]" to be used with ARRAY_SIZE not with a NULL 
> termination, as the size is known during compile time. 
>
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 
> --- 
> drivers/net/can/usb/peak_usb/pcan_usb_core.c | 10 +++++----- 
> 1 file changed, 5 insertions(+), 5 deletions(-) 
>
> diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> index c62f48a1161d..26c0cc3ce3b2 100644 
> --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c 
> @@ -46,7 +46,6 @@ MODULE_DEVICE_TABLE(usb, peak_usb_table); 
> static struct peak_usb_adapter *peak_usb_adapters_list[] = { 
> &pcan_usb, 
> &pcan_usb_pro, 
> - NULL, 
> }; 
>
> /* 
> @@ -857,17 +856,18 @@ static int peak_usb_probe(struct usb_interface *intf, 
> { 
> struct usb_device *usb_dev = interface_to_usbdev(intf); 
> const u16 usb_id_product = le16_to_cpu(usb_dev->descriptor.idProduct); 
> - struct peak_usb_adapter *peak_usb_adapter, **pp; 
> + struct peak_usb_adapter *peak_usb_adapter = NULL; 
> int i, err = -ENOMEM; 
>
> usb_dev = interface_to_usbdev(intf); 
>
> /* get corresponding PCAN-USB adapter */ 
> - for (pp = peak_usb_adapters_list; *pp; pp++) 
> - if ((*pp)->device_id == usb_id_product) 
> + for (i = 0; i < ARRAY_SIZE(peak_usb_adapters_list); i++) 
> + if (peak_usb_adapters_list[i]->device_id == usb_id_product) { 
> + peak_usb_adapter = peak_usb_adapters_list[i]; 
> break; 
> + } 
>
> - peak_usb_adapter = *pp; 
> if (!peak_usb_adapter) { 
> /* should never come except device_id bad usage in this file */ 
> pr_err("%s: didn't find device id. 0x%x in devices list\n", 
> -- 
> 2.1.4 
>

[-- Attachment #2: Signature.txt --]
[-- Type: text/plain, Size: 151 bytes --]

--
PEAK-System Technik GmbH
Sitz der Gesellschaft Darmstadt
Handelsregister Darmstadt HRB 9183 
Geschaeftsfuehrung: Alexander Gach, Uwe Wilhelm
--

Re: [PATCH v10 1/9] can: peak_usb: use ARRAY_SIZE instead off NULL termination for peak_usb_adapters_list

[Marc Kleine-Budde]

[-- Attachment #1: Type: text/plain, Size: 398 bytes --]

On 01/27/2015 10:02 PM, Stéphane Grosjean wrote:
> Hi Mark,
> 
> You've got my Ack for this patch.

Thanks,
Marc

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]