staging: gpib: Correct CamelCase for BUS constants

Adhere to Linux kernel coding style and remove duplicate enums.

Reported by checkpatch

CHECK: Avoid CamelCase

Signed-off-by: Michael Rubin <matchstick@neverthere.org>
Acked-By: Dave Penkler <dpenkler@gmail.com>
Link: https://lore.kernel.org/r/20250319211827.9854-2-matchstick@neverthere.org
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 e0d36f0dff25eda2506f28e221b93de42c050aff..17f41817587b91e521c0ab1b1b96927908de4085 100644 (file)
--- a/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
+++ b/drivers/staging/gpib/agilent_82357a/agilent_82357a.c
@@ -1030,21 +1030,21 @@ static int agilent_82357a_line_status(const gpib_board_t *board)
                return retval;
        }
        if (bus_status.value & BSR_REN_BIT)
-               status |= BusREN;
+               status |= BUS_REN;
        if (bus_status.value & BSR_IFC_BIT)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if (bus_status.value & BSR_SRQ_BIT)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if (bus_status.value & BSR_EOI_BIT)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if (bus_status.value & BSR_NRFD_BIT)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if (bus_status.value & BSR_NDAC_BIT)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if (bus_status.value & BSR_DAV_BIT)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if (bus_status.value & BSR_ATN_BIT)
-               status |= BusATN;
+               status |= BUS_ATN;
        return status;
 }
 

diff --git a/drivers/staging/gpib/cb7210/cb7210.c b/drivers/staging/gpib/cb7210/cb7210.c
index 19dfd8b4a8e7d9554f6b255bbf7ab2ad6c59b047..ba02dce62dd97cebda5725903626bb80b84114ce 100644 (file)
--- a/drivers/staging/gpib/cb7210/cb7210.c
+++ b/drivers/staging/gpib/cb7210/cb7210.c
@@ -388,21 +388,21 @@ static int cb7210_line_status(const gpib_board_t *board)
        bsr_bits = cb7210_paged_read_byte(cb_priv, BUS_STATUS, BUS_STATUS_PAGE);
 
        if ((bsr_bits & BSR_REN_BIT) == 0)
-               status |= BusREN;
+               status |= BUS_REN;
        if ((bsr_bits & BSR_IFC_BIT) == 0)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if ((bsr_bits & BSR_SRQ_BIT) == 0)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if ((bsr_bits & BSR_EOI_BIT) == 0)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if ((bsr_bits & BSR_NRFD_BIT) == 0)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if ((bsr_bits & BSR_NDAC_BIT) == 0)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if ((bsr_bits & BSR_DAV_BIT) == 0)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if ((bsr_bits & BSR_ATN_BIT) == 0)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/common/iblib.c b/drivers/staging/gpib/common/iblib.c
index fd2874c2fff4013267e06d555d252e5b5205c652..1caa57b41596469009788bd1e8c30918783199cb 100644 (file)
--- a/drivers/staging/gpib/common/iblib.c
+++ b/drivers/staging/gpib/common/iblib.c
@@ -77,7 +77,7 @@ static int check_for_command_acceptors(gpib_board_t *board)
                return lines;
 
        if ((lines & ValidNRFD) && (lines & ValidNDAC)) {
-               if ((lines & BusNRFD) == 0 && (lines & BusNDAC) == 0)
+               if ((lines & BUS_NRFD) == 0 && (lines & BUS_NDAC) == 0)
                        return -ENOTCONN;
        }
 
@@ -521,7 +521,7 @@ int general_ibstatus(gpib_board_t *board, const gpib_status_queue_t *device,
                /* get real SRQI status if we can */
                if (iblines(board, &line_status) == 0) {
                        if ((line_status & ValidSRQ)) {
-                               if ((line_status & BusSRQ))
+                               if ((line_status & BUS_SRQ))
                                        status |= SRQI;
                                else
                                        status &= ~SRQI;

diff --git a/drivers/staging/gpib/eastwood/fluke_gpib.c b/drivers/staging/gpib/eastwood/fluke_gpib.c
index 731732bd8301201a10160671ec83cb4b48b36bde..4e04acfdb48d45cb01d0d1764877d7216ceb79d9 100644 (file)
--- a/drivers/staging/gpib/eastwood/fluke_gpib.c
+++ b/drivers/staging/gpib/eastwood/fluke_gpib.c
@@ -204,21 +204,21 @@ static int fluke_line_status(const gpib_board_t *board)
        bsr_bits = fluke_paged_read_byte(e_priv, BUS_STATUS, BUS_STATUS_PAGE);
 
        if ((bsr_bits & BSR_REN_BIT) == 0)
-               status |= BusREN;
+               status |= BUS_REN;
        if ((bsr_bits & BSR_IFC_BIT) == 0)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if ((bsr_bits & BSR_SRQ_BIT) == 0)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if ((bsr_bits & BSR_EOI_BIT) == 0)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if ((bsr_bits & BSR_NRFD_BIT) == 0)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if ((bsr_bits & BSR_NDAC_BIT) == 0)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if ((bsr_bits & BSR_DAV_BIT) == 0)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if ((bsr_bits & BSR_ATN_BIT) == 0)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
index d62c83368518e9c725d026f9ff2273982370fbbe..8fbfa7e285af44c87808e4a35419844b78fa4fee 100644 (file)
--- a/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
+++ b/drivers/staging/gpib/fmh_gpib/fmh_gpib.c
@@ -240,21 +240,21 @@ static int fmh_gpib_line_status(const gpib_board_t *board)
        bsr_bits = read_byte(nec_priv, BUS_STATUS_REG);
 
        if ((bsr_bits & BSR_REN_BIT) == 0)
-               status |= BusREN;
+               status |= BUS_REN;
        if ((bsr_bits & BSR_IFC_BIT) == 0)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if ((bsr_bits & BSR_SRQ_BIT) == 0)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if ((bsr_bits & BSR_EOI_BIT) == 0)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if ((bsr_bits & BSR_NRFD_BIT) == 0)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if ((bsr_bits & BSR_NDAC_BIT) == 0)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if ((bsr_bits & BSR_DAV_BIT) == 0)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if ((bsr_bits & BSR_ATN_BIT) == 0)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/gpio/gpib_bitbang.c b/drivers/staging/gpib/gpio/gpib_bitbang.c
index 2012db188f58b24784d4ec4a64d5fa4833528f7a..004bf0e9bc888cfde2e83e78bd9e74378602c6e4 100644 (file)
--- a/drivers/staging/gpib/gpio/gpib_bitbang.c
+++ b/drivers/staging/gpib/gpio/gpib_bitbang.c
@@ -1034,21 +1034,21 @@ static int bb_line_status(const gpib_board_t *board)
        int line_status = ValidALL;
 
        if (gpiod_get_value(REN) == 0)
-               line_status |= BusREN;
+               line_status |= BUS_REN;
        if (gpiod_get_value(IFC) == 0)
-               line_status |= BusIFC;
+               line_status |= BUS_IFC;
        if (gpiod_get_value(NDAC) == 0)
-               line_status |= BusNDAC;
+               line_status |= BUS_NDAC;
        if (gpiod_get_value(NRFD) == 0)
-               line_status |= BusNRFD;
+               line_status |= BUS_NRFD;
        if (gpiod_get_value(DAV) == 0)
-               line_status |= BusDAV;
+               line_status |= BUS_DAV;
        if (gpiod_get_value(EOI) == 0)
-               line_status |= BusEOI;
+               line_status |= BUS_EOI;
        if (gpiod_get_value(_ATN) == 0)
-               line_status |= BusATN;
+               line_status |= BUS_ATN;
        if (gpiod_get_value(SRQ) == 0)
-               line_status |= BusSRQ;
+               line_status |= BUS_SRQ;
 
        dbg_printk(2, "status lines: %4x\n", line_status);
 

diff --git a/drivers/staging/gpib/hp_82341/hp_82341.c b/drivers/staging/gpib/hp_82341/hp_82341.c
index 91fbaf953bcd105402da32f4f97c512e5a685131..b5d79ae519e7b308595826d1d9e2b2fc50341c92 100644 (file)
--- a/drivers/staging/gpib/hp_82341/hp_82341.c
+++ b/drivers/staging/gpib/hp_82341/hp_82341.c
@@ -158,7 +158,7 @@ static int restart_write_fifo(gpib_board_t *board, struct hp_82341_priv *hp_priv
 
                //restart doesn't work if data holdoff is in effect
                status = tms9914_line_status(board, tms_priv);
-               if ((status & BusNRFD) == 0) {
+               if ((status & BUS_NRFD) == 0) {
                        outb(RESTART_STREAM_BIT, hp_priv->iobase[0] + STREAM_STATUS_REG);
                        return 0;
                }

diff --git a/drivers/staging/gpib/ines/ines_gpib.c b/drivers/staging/gpib/ines/ines_gpib.c
index 56da6cd9118882ce95629e654c77ef535d3b2933..c5c34845fc382363ea4fa42d614115effba2ddc1 100644 (file)
--- a/drivers/staging/gpib/ines/ines_gpib.c
+++ b/drivers/staging/gpib/ines/ines_gpib.c
@@ -36,21 +36,21 @@ int ines_line_status(const gpib_board_t *board)
        bcm_bits = ines_inb(ines_priv, BUS_CONTROL_MONITOR);
 
        if (bcm_bits & BCM_REN_BIT)
-               status |= BusREN;
+               status |= BUS_REN;
        if (bcm_bits & BCM_IFC_BIT)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if (bcm_bits & BCM_SRQ_BIT)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if (bcm_bits & BCM_EOI_BIT)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if (bcm_bits & BCM_NRFD_BIT)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if (bcm_bits & BCM_NDAC_BIT)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if (bcm_bits & BCM_DAV_BIT)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if (bcm_bits & BCM_ATN_BIT)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
index 50faa0c17617e5c99fb6fbae448c2ec3c6ef319f..2775dc83305ecb67a69795a9a72ffb211855eead 100644 (file)
--- a/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
+++ b/drivers/staging/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c
@@ -694,21 +694,21 @@ static int usb_gpib_line_status(const gpib_board_t *board)
        }
 
        if ((buffer & 0x01) == 0)
-               line_status |= BusREN;
+               line_status |= BUS_REN;
        if ((buffer & 0x02) == 0)
-               line_status |= BusIFC;
+               line_status |= BUS_IFC;
        if ((buffer & 0x04) == 0)
-               line_status |= BusNDAC;
+               line_status |= BUS_NDAC;
        if ((buffer & 0x08) == 0)
-               line_status |= BusNRFD;
+               line_status |= BUS_NRFD;
        if ((buffer & 0x10) == 0)
-               line_status |= BusDAV;
+               line_status |= BUS_DAV;
        if ((buffer & 0x20) == 0)
-               line_status |= BusEOI;
+               line_status |= BUS_EOI;
        if ((buffer & 0x40) == 0)
-               line_status |= BusATN;
+               line_status |= BUS_ATN;
        if ((buffer & 0x80) == 0)
-               line_status |= BusSRQ;
+               line_status |= BUS_SRQ;
 
        DIA_LOG(1, "done with %x %x\n", buffer, line_status);
 

diff --git a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
index 62fbc78204ce5f0c757527545921b3d2e14efda2..a788af70fa64890e7c87938913bc00e5e1e1ae1c 100644 (file)
--- a/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
+++ b/drivers/staging/gpib/ni_usb/ni_usb_gpib.c
@@ -1561,21 +1561,21 @@ static int ni_usb_line_status(const gpib_board_t *board)
        ni_usb_parse_register_read_block(in_data, &bsr_bits, 1);
        kfree(in_data);
        if (bsr_bits & BCSR_REN_BIT)
-               line_status |= BusREN;
+               line_status |= BUS_REN;
        if (bsr_bits & BCSR_IFC_BIT)
-               line_status |= BusIFC;
+               line_status |= BUS_IFC;
        if (bsr_bits & BCSR_SRQ_BIT)
-               line_status |= BusSRQ;
+               line_status |= BUS_SRQ;
        if (bsr_bits & BCSR_EOI_BIT)
-               line_status |= BusEOI;
+               line_status |= BUS_EOI;
        if (bsr_bits & BCSR_NRFD_BIT)
-               line_status |= BusNRFD;
+               line_status |= BUS_NRFD;
        if (bsr_bits & BCSR_NDAC_BIT)
-               line_status |= BusNDAC;
+               line_status |= BUS_NDAC;
        if (bsr_bits & BCSR_DAV_BIT)
-               line_status |= BusDAV;
+               line_status |= BUS_DAV;
        if (bsr_bits & BCSR_ATN_BIT)
-               line_status |= BusATN;
+               line_status |= BUS_ATN;
        return line_status;
 }
 

diff --git a/drivers/staging/gpib/tms9914/tms9914.c b/drivers/staging/gpib/tms9914/tms9914.c
index 1f2bb163cfb5709741469217399081b90282488a..17adeccf448bb64cbb0dc3d75ed7ab1050c48469 100644 (file)
--- a/drivers/staging/gpib/tms9914/tms9914.c
+++ b/drivers/staging/gpib/tms9914/tms9914.c
@@ -396,21 +396,21 @@ int tms9914_line_status(const gpib_board_t *board, struct tms9914_priv *priv)
        bsr_bits = read_byte(priv, BSR);
 
        if (bsr_bits & BSR_REN_BIT)
-               status |= BusREN;
+               status |= BUS_REN;
        if (bsr_bits & BSR_IFC_BIT)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if (bsr_bits & BSR_SRQ_BIT)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if (bsr_bits & BSR_EOI_BIT)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if (bsr_bits & BSR_NRFD_BIT)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if (bsr_bits & BSR_NDAC_BIT)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if (bsr_bits & BSR_DAV_BIT)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if (bsr_bits & BSR_ATN_BIT)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
index d32420dee5e5bb75cc53bcc0559b9f5b0c6aed05..76fd9422809c1f41d2137c489ef8e94824cadc2f 100644 (file)
--- a/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
+++ b/drivers/staging/gpib/tnt4882/tnt4882_gpib.c
@@ -159,21 +159,21 @@ static int tnt4882_line_status(const gpib_board_t *board)
        bcsr_bits = tnt_readb(tnt_priv, BSR);
 
        if (bcsr_bits & BCSR_REN_BIT)
-               status |= BusREN;
+               status |= BUS_REN;
        if (bcsr_bits & BCSR_IFC_BIT)
-               status |= BusIFC;
+               status |= BUS_IFC;
        if (bcsr_bits & BCSR_SRQ_BIT)
-               status |= BusSRQ;
+               status |= BUS_SRQ;
        if (bcsr_bits & BCSR_EOI_BIT)
-               status |= BusEOI;
+               status |= BUS_EOI;
        if (bcsr_bits & BCSR_NRFD_BIT)
-               status |= BusNRFD;
+               status |= BUS_NRFD;
        if (bcsr_bits & BCSR_NDAC_BIT)
-               status |= BusNDAC;
+               status |= BUS_NDAC;
        if (bcsr_bits & BCSR_DAV_BIT)
-               status |= BusDAV;
+               status |= BUS_DAV;
        if (bcsr_bits & BCSR_ATN_BIT)
-               status |= BusATN;
+               status |= BUS_ATN;
 
        return status;
 }

diff --git a/drivers/staging/gpib/uapi/gpib_user.h b/drivers/staging/gpib/uapi/gpib_user.h
index 0896a55a758feeae61da2047b001e482b530041b..2d742540630a2d784736f8e11fb4c4ed9df97e68 100644 (file)
--- a/drivers/staging/gpib/uapi/gpib_user.h
+++ b/drivers/staging/gpib/uapi/gpib_user.h
@@ -115,17 +115,6 @@ enum bus_control_line {
        ValidATN = 0x40,
        ValidEOI = 0x80,
        ValidALL = 0xff,
-       BusDAV = 0x0100,                /* DAV  line status bit */
-       BusNDAC = 0x0200,               /* NDAC line status bit */
-       BusNRFD = 0x0400,               /* NRFD line status bit */
-       BusIFC = 0x0800,                /* IFC  line status bit */
-       BusREN = 0x1000,                /* REN  line status bit */
-       BusSRQ = 0x2000,                /* SRQ  line status bit */
-       BusATN = 0x4000,                /* ATN  line status bit */
-       BusEOI = 0x8000         /* EOI  line status bit */
-};
-
-enum old_bus_control_line {
        BUS_DAV = 0x0100,               /* DAV  line status bit */
        BUS_NDAC = 0x0200,              /* NDAC line status bit */
        BUS_NRFD = 0x0400,              /* NRFD line status bit */