Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359Ab0ALHw6 (ORCPT ); Tue, 12 Jan 2010 02:52:58 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753302Ab0ALHw6 (ORCPT ); Tue, 12 Jan 2010 02:52:58 -0500 Received: from mail01d.mail.t-online.hu ([84.2.42.6]:62319 "EHLO mail01d.mail.t-online.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753028Ab0ALHw5 (ORCPT ); Tue, 12 Jan 2010 02:52:57 -0500 Message-ID: <4B4C2A52.70800@freemail.hu> Date: Tue, 12 Jan 2010 08:52:50 +0100 From: =?UTF-8?B?TsOpbWV0aCBNw6FydG9u?= User-Agent: Mozilla/5.0 (X11; U; Linux i686; hu-HU; rv:1.8.1.21) Gecko/20090402 SeaMonkey/1.1.16 MIME-Version: 1.0 To: Karsten Keil CC: isdn4linux@listserv.isdn4linux.de, LKML , Julia Lawall , cocci@diku.dk Subject: [PATCH] isdn: make USB device id constant Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-DCC-mail.t-online.hu-Metrics: mail01d.mail.t-online.hu 32711; Body=5 Fuz1=5 Fuz2=5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2657 Lines: 83 From: Márton Németh The id_table field of the struct usb_device_id is constant in so it is worth to make the initialization data also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Cc: Julia Lawall Cc: cocci@diku.dk --- diff -u -p a/drivers/isdn/hardware/mISDN/hfcsusb.h b/drivers/isdn/hardware/mISDN/hfcsusb.h --- a/drivers/isdn/hardware/mISDN/hfcsusb.h 2010-01-07 19:08:40.000000000 +0100 +++ b/drivers/isdn/hardware/mISDN/hfcsusb.h 2010-01-08 13:36:54.000000000 +0100 @@ -337,7 +337,7 @@ static const char *HFC_NT_LAYER1_STATES[ }; /* supported devices */ -static struct usb_device_id hfcsusb_idtab[] = { +static const struct usb_device_id hfcsusb_idtab[] = { { USB_DEVICE(0x0959, 0x2bd0), .driver_info = (unsigned long) &((struct hfcsusb_vdata) diff -u -p a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c --- a/drivers/isdn/hisax/hfc_usb.c 2010-01-07 19:08:40.000000000 +0100 +++ b/drivers/isdn/hisax/hfc_usb.c 2010-01-08 13:49:53.000000000 +0100 @@ -64,7 +64,7 @@ typedef struct { } hfcsusb_vdata; /* VID/PID device list */ -static struct usb_device_id hfcusb_idtab[] = { +static const struct usb_device_id hfcusb_idtab[] = { { USB_DEVICE(0x0959, 0x2bd0), .driver_info = (unsigned long) &((hfcsusb_vdata) diff -u -p a/drivers/isdn/hisax/st5481_init.c b/drivers/isdn/hisax/st5481_init.c --- a/drivers/isdn/hisax/st5481_init.c 2009-12-03 04:51:21.000000000 +0100 +++ b/drivers/isdn/hisax/st5481_init.c 2010-01-08 13:50:45.000000000 +0100 @@ -160,7 +160,7 @@ static void disconnect_st5481(struct usb /* * The last 4 bits in the Product Id is set with 4 pins on the chip. */ -static struct usb_device_id st5481_ids[] = { +static const struct usb_device_id st5481_ids[] = { { USB_DEVICE(ST_VENDOR_ID, ST5481_PRODUCT_ID+0x0) }, { USB_DEVICE(ST_VENDOR_ID, ST5481_PRODUCT_ID+0x1) }, { USB_DEVICE(ST_VENDOR_ID, ST5481_PRODUCT_ID+0x2) }, -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/