staging: gpib: Use C99 syntax and make static

Some drivers were still using the old syntax for initializing
structs:
field : value;

This caused sparse to emit the following warning, for example:
common/gpib_os.c:2026:1: warning: obsolete struct initializer, use C99 syntax

Use C99 syntax:
.field = value;

Some local structs and arrays were not declared static causing
sparse to emit the following warning, for example:
warning: symbol 'ib_fops' was not declared. Should it be static?

Declare the local structs and arrays as static.

Signed-off-by: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250114165403.16410-5-dpenkler@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
index c22c6bb307765c98a27dbe9591947aa1317ce00d..34d85a1bdb37b6b16de0f1f35cc86cae43387947 100644 (file)
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
@@ -19,7 +19,7 @@ MODULE_DESCRIPTION("GPIB driver for Agilent 82357A/B usb adapters");
 
 #define MAX_NUM_82357A_INTERFACES 128
 static struct usb_interface *agilent_82357a_driver_interfaces[MAX_NUM_82357A_INTERFACES];
-DEFINE_MUTEX(agilent_82357a_hotplug_lock); // protect board insertion and removal
+static DEFINE_MUTEX(agilent_82357a_hotplug_lock); // protect board insertion and removal
 
 static unsigned int agilent_82357a_update_status(gpib_board_t *board, unsigned int clear_mask);
 

diff --git a/drivers/staging/gpib/common/gpib_os.c b/drivers/staging/gpib/common/gpib_os.c
index 3234d434895727d71698f66b694310bbb509de7b..4901e660242e70dac8ef0523b57eb70bf904bb15 100644 (file)
--- a/drivers/staging/gpib/common/gpib_os.c
+++ b/drivers/staging/gpib/common/gpib_os.c
@@ -2023,13 +2023,13 @@ static int t1_delay_ioctl(gpib_board_t *board, unsigned long arg)
        return 0;
 }
 
-const struct file_operations ib_fops = {
-owner: THIS_MODULE,
-llseek : NULL,
-unlocked_ioctl : &ibioctl,
-compat_ioctl : &ibioctl,
-open : &ibopen,
-release : &ibclose,
+static const struct file_operations ib_fops = {
+       .owner = THIS_MODULE,
+       .llseek = NULL,
+       .unlocked_ioctl = &ibioctl,
+       .compat_ioctl = &ibioctl,
+       .open = &ibopen,
+       .release = &ibclose,
 };
 
 gpib_board_t board_array[GPIB_MAX_NUM_BOARDS];

diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 16e2d0c5642e887b4e3647b7913965fdb33d7fc2..828c99ea613f7c9456d8156fb086792b0a83a80e 100644 (file)
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -147,7 +147,7 @@ DEFINE_LED_TRIGGER(ledtrig_gpib);
                        led_trigger_event(ledtrig_gpib, LED_OFF); }     \
        while (0)
 
-struct gpio_desc *all_descriptors[GPIB_PINS + SN7516X_PINS];
+static struct gpio_desc *all_descriptors[GPIB_PINS + SN7516X_PINS];
 
 #define D01 all_descriptors[0]
 #define D02 all_descriptors[1]
@@ -175,7 +175,7 @@ struct gpio_desc *all_descriptors[GPIB_PINS + SN7516X_PINS];
 /* YOGA dapter uses a global enable for the buffer chips, re-using the TE pin */
 #define YOGA_ENABLE TE
 
-int gpios_vector[] = {
+static int gpios_vector[] = {
        D01_pin_nr,
        D02_pin_nr,
        D03_pin_nr,

diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/ines/ines_gpib.c
index 846dafc85c116813ecc79eab2ba279f3d253cb9f..22a05a287bce17f0c0925845de3bfec55fbc21b6 100644 (file)
--- a/drivers/staging/gpib/ines/ines_gpib.c
+++ b/drivers/staging/gpib/ines/ines_gpib.c
@@ -357,38 +357,38 @@ struct ines_pci_id {
        enum ines_pci_chip pci_chip_type;
 };
 
-struct ines_pci_id pci_ids[] = {
-       {vendor_id: PCI_VENDOR_ID_PLX,
-        device_id : PCI_DEVICE_ID_PLX_9050,
-        subsystem_vendor_id : PCI_VENDOR_ID_PLX,
-        subsystem_device_id : PCI_SUBDEVICE_ID_INES_GPIB,
-        gpib_region : 2,
-        io_offset : 1,
-        pci_chip_type : PCI_CHIP_PLX9050,
+static struct ines_pci_id pci_ids[] = {
+       {.vendor_id = PCI_VENDOR_ID_PLX,
+        .device_id = PCI_DEVICE_ID_PLX_9050,
+        .subsystem_vendor_id = PCI_VENDOR_ID_PLX,
+        .subsystem_device_id = PCI_SUBDEVICE_ID_INES_GPIB,
+        .gpib_region = 2,
+        .io_offset = 1,
+        .pci_chip_type = PCI_CHIP_PLX9050,
        },
-       {vendor_id: PCI_VENDOR_ID_AMCC,
-        device_id : PCI_DEVICE_ID_INES_GPIB_AMCC,
-        subsystem_vendor_id : PCI_VENDOR_ID_AMCC,
-        subsystem_device_id : PCI_SUBDEVICE_ID_INES_GPIB,
-        gpib_region : 1,
-        io_offset : 1,
-        pci_chip_type : PCI_CHIP_AMCC5920,
+       {.vendor_id = PCI_VENDOR_ID_AMCC,
+        .device_id = PCI_DEVICE_ID_INES_GPIB_AMCC,
+        .subsystem_vendor_id = PCI_VENDOR_ID_AMCC,
+        .subsystem_device_id = PCI_SUBDEVICE_ID_INES_GPIB,
+        .gpib_region = 1,
+        .io_offset = 1,
+        .pci_chip_type = PCI_CHIP_AMCC5920,
        },
-       {vendor_id: PCI_VENDOR_ID_INES_QUICKLOGIC,
-        device_id : PCI_DEVICE_ID_INES_GPIB_QL5030,
-        subsystem_vendor_id : PCI_VENDOR_ID_INES_QUICKLOGIC,
-        subsystem_device_id : PCI_DEVICE_ID_INES_GPIB_QL5030,
-        gpib_region : 1,
-        io_offset : 1,
-        pci_chip_type : PCI_CHIP_QUICKLOGIC5030,
+       {.vendor_id = PCI_VENDOR_ID_INES_QUICKLOGIC,
+        .device_id = PCI_DEVICE_ID_INES_GPIB_QL5030,
+        .subsystem_vendor_id = PCI_VENDOR_ID_INES_QUICKLOGIC,
+        .subsystem_device_id = PCI_DEVICE_ID_INES_GPIB_QL5030,
+        .gpib_region = 1,
+        .io_offset = 1,
+        .pci_chip_type = PCI_CHIP_QUICKLOGIC5030,
        },
-       {vendor_id: PCI_VENDOR_ID_QUANCOM,
-        device_id : PCI_DEVICE_ID_QUANCOM_GPIB,
-        subsystem_vendor_id : -1,
-        subsystem_device_id : -1,
-        gpib_region : 0,
-        io_offset : 4,
-        pci_chip_type : PCI_CHIP_QUANCOM,
+       {.vendor_id = PCI_VENDOR_ID_QUANCOM,
+        .device_id = PCI_DEVICE_ID_QUANCOM_GPIB,
+        .subsystem_vendor_id = -1,
+        .subsystem_device_id = -1,
+        .gpib_region = 0,
+        .io_offset = 4,
+        .pci_chip_type = PCI_CHIP_QUANCOM,
        },
 };