Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: dgnc: fix CamelCase in dgnc_driver.c

fix checkpatch.pl warning about CamelCase.

Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Daeseok Youn and committed by
Greg Kroah-Hartman
80e3e241 87787e5e

+44 -44
+26 -26
drivers/staging/dgnc/dgnc_driver.c
··· 48 48 /* 49 49 * File operations permitted on Control/Management major. 50 50 */ 51 - static const struct file_operations dgnc_BoardFops = { 51 + static const struct file_operations dgnc_board_fops = { 52 52 .owner = THIS_MODULE, 53 53 .unlocked_ioctl = dgnc_mgmt_ioctl, 54 54 .open = dgnc_mgmt_open, ··· 58 58 /* 59 59 * Globals 60 60 */ 61 - uint dgnc_NumBoards; 62 - struct dgnc_board *dgnc_Board[MAXBOARDS]; 61 + uint dgnc_num_boards; 62 + struct dgnc_board *dgnc_board[MAXBOARDS]; 63 63 DEFINE_SPINLOCK(dgnc_global_lock); 64 64 DEFINE_SPINLOCK(dgnc_poll_lock); /* Poll scheduling lock */ 65 - uint dgnc_Major; 65 + uint dgnc_major; 66 66 int dgnc_poll_tick = 20; /* Poll interval - 20 ms */ 67 67 68 68 /* ··· 92 92 unsigned int is_pci_express; 93 93 }; 94 94 95 - static struct board_id dgnc_Ids[] = { 95 + static struct board_id dgnc_ids[] = { 96 96 { PCI_DEVICE_CLASSIC_4_PCI_NAME, 4, 0 }, 97 97 { PCI_DEVICE_CLASSIC_4_422_PCI_NAME, 4, 0 }, 98 98 { PCI_DEVICE_CLASSIC_8_PCI_NAME, 8, 0 }, ··· 140 140 if (sysfiles) 141 141 dgnc_remove_driver_sysfiles(&dgnc_driver); 142 142 143 - device_destroy(dgnc_class, MKDEV(dgnc_Major, 0)); 143 + device_destroy(dgnc_class, MKDEV(dgnc_major, 0)); 144 144 class_destroy(dgnc_class); 145 - unregister_chrdev(dgnc_Major, "dgnc"); 145 + unregister_chrdev(dgnc_major, "dgnc"); 146 146 147 - for (i = 0; i < dgnc_NumBoards; ++i) { 148 - dgnc_remove_ports_sysfiles(dgnc_Board[i]); 149 - dgnc_tty_uninit(dgnc_Board[i]); 150 - dgnc_cleanup_board(dgnc_Board[i]); 147 + for (i = 0; i < dgnc_num_boards; ++i) { 148 + dgnc_remove_ports_sysfiles(dgnc_board[i]); 149 + dgnc_tty_uninit(dgnc_board[i]); 150 + dgnc_cleanup_board(dgnc_board[i]); 151 151 } 152 152 153 153 dgnc_tty_post_uninit(); ··· 217 217 * 218 218 * Register management/dpa devices 219 219 */ 220 - rc = register_chrdev(0, "dgnc", &dgnc_BoardFops); 220 + rc = register_chrdev(0, "dgnc", &dgnc_board_fops); 221 221 if (rc < 0) { 222 222 pr_err(DRVSTR ": Can't register dgnc driver device (%d)\n", rc); 223 223 return rc; 224 224 } 225 - dgnc_Major = rc; 225 + dgnc_major = rc; 226 226 227 227 dgnc_class = class_create(THIS_MODULE, "dgnc_mgmt"); 228 228 if (IS_ERR(dgnc_class)) { ··· 232 232 } 233 233 234 234 dev = device_create(dgnc_class, NULL, 235 - MKDEV(dgnc_Major, 0), 235 + MKDEV(dgnc_major, 0), 236 236 NULL, "dgnc_mgmt"); 237 237 if (IS_ERR(dev)) { 238 238 rc = PTR_ERR(dev); ··· 262 262 return 0; 263 263 264 264 failed_tty: 265 - device_destroy(dgnc_class, MKDEV(dgnc_Major, 0)); 265 + device_destroy(dgnc_class, MKDEV(dgnc_major, 0)); 266 266 failed_device: 267 267 class_destroy(dgnc_class); 268 268 failed_class: 269 - unregister_chrdev(dgnc_Major, "dgnc"); 269 + unregister_chrdev(dgnc_major, "dgnc"); 270 270 return rc; 271 271 } 272 272 ··· 283 283 284 284 rc = dgnc_found_board(pdev, ent->driver_data); 285 285 if (rc == 0) 286 - dgnc_NumBoards++; 286 + dgnc_num_boards++; 287 287 288 288 return rc; 289 289 } ··· 346 346 } 347 347 } 348 348 349 - dgnc_Board[brd->boardnum] = NULL; 349 + dgnc_board[brd->boardnum] = NULL; 350 350 351 351 kfree(brd); 352 352 } ··· 365 365 unsigned long flags; 366 366 367 367 /* get the board structure and prep it */ 368 - dgnc_Board[dgnc_NumBoards] = kzalloc(sizeof(*brd), GFP_KERNEL); 369 - brd = dgnc_Board[dgnc_NumBoards]; 368 + dgnc_board[dgnc_num_boards] = kzalloc(sizeof(*brd), GFP_KERNEL); 369 + brd = dgnc_board[dgnc_num_boards]; 370 370 371 371 if (!brd) 372 372 return -ENOMEM; ··· 382 382 383 383 /* store the info for the board we've found */ 384 384 brd->magic = DGNC_BOARD_MAGIC; 385 - brd->boardnum = dgnc_NumBoards; 385 + brd->boardnum = dgnc_num_boards; 386 386 brd->vendor = dgnc_pci_tbl[id].vendor; 387 387 brd->device = dgnc_pci_tbl[id].device; 388 388 brd->pdev = pdev; 389 389 brd->pci_bus = pdev->bus->number; 390 390 brd->pci_slot = PCI_SLOT(pdev->devfn); 391 - brd->name = dgnc_Ids[id].name; 392 - brd->maxports = dgnc_Ids[id].maxports; 393 - if (dgnc_Ids[i].is_pci_express) 391 + brd->name = dgnc_ids[id].name; 392 + brd->maxports = dgnc_ids[id].maxports; 393 + if (dgnc_ids[i].is_pci_express) 394 394 brd->bd_flags |= BD_IS_PCI_EXPRESS; 395 395 brd->dpastatus = BD_NOFEP; 396 396 init_waitqueue_head(&brd->state_wait); ··· 642 642 unsigned long new_time; 643 643 644 644 /* Go thru each board, kicking off a tasklet for each if needed */ 645 - for (i = 0; i < dgnc_NumBoards; i++) { 646 - brd = dgnc_Board[i]; 645 + for (i = 0; i < dgnc_num_boards; i++) { 646 + brd = dgnc_board[i]; 647 647 648 648 spin_lock_irqsave(&brd->bd_lock, flags); 649 649
+3 -3
drivers/staging/dgnc/dgnc_driver.h
··· 399 399 /* 400 400 * Our Global Variables. 401 401 */ 402 - extern uint dgnc_Major; /* Our driver/mgmt major */ 402 + extern uint dgnc_major; /* Our driver/mgmt major */ 403 403 extern int dgnc_poll_tick; /* Poll interval - 20 ms */ 404 404 extern spinlock_t dgnc_global_lock; /* Driver global spinlock */ 405 405 extern spinlock_t dgnc_poll_lock; /* Poll scheduling lock */ 406 - extern uint dgnc_NumBoards; /* Total number of boards */ 407 - extern struct dgnc_board *dgnc_Board[MAXBOARDS]; /* Array of board 406 + extern uint dgnc_num_boards; /* Total number of boards */ 407 + extern struct dgnc_board *dgnc_board[MAXBOARDS]; /* Array of board 408 408 * structs 409 409 */ 410 410
+14 -14
drivers/staging/dgnc/dgnc_mgmt.c
··· 111 111 spin_lock_irqsave(&dgnc_global_lock, flags); 112 112 113 113 memset(&ddi, 0, sizeof(ddi)); 114 - ddi.dinfo_nboards = dgnc_NumBoards; 114 + ddi.dinfo_nboards = dgnc_num_boards; 115 115 sprintf(ddi.dinfo_version, "%s", DG_PART); 116 116 117 117 spin_unlock_irqrestore(&dgnc_global_lock, flags); ··· 131 131 if (copy_from_user(&brd, uarg, sizeof(int))) 132 132 return -EFAULT; 133 133 134 - if (brd < 0 || brd >= dgnc_NumBoards) 134 + if (brd < 0 || brd >= dgnc_num_boards) 135 135 return -ENODEV; 136 136 137 137 memset(&di, 0, sizeof(di)); 138 138 139 139 di.info_bdnum = brd; 140 140 141 - spin_lock_irqsave(&dgnc_Board[brd]->bd_lock, flags); 141 + spin_lock_irqsave(&dgnc_board[brd]->bd_lock, flags); 142 142 143 - di.info_bdtype = dgnc_Board[brd]->dpatype; 144 - di.info_bdstate = dgnc_Board[brd]->dpastatus; 143 + di.info_bdtype = dgnc_board[brd]->dpatype; 144 + di.info_bdstate = dgnc_board[brd]->dpastatus; 145 145 di.info_ioport = 0; 146 - di.info_physaddr = (ulong)dgnc_Board[brd]->membase; 147 - di.info_physsize = (ulong)dgnc_Board[brd]->membase 148 - - dgnc_Board[brd]->membase_end; 149 - if (dgnc_Board[brd]->state != BOARD_FAILED) 150 - di.info_nports = dgnc_Board[brd]->nasync; 146 + di.info_physaddr = (ulong)dgnc_board[brd]->membase; 147 + di.info_physsize = (ulong)dgnc_board[brd]->membase 148 + - dgnc_board[brd]->membase_end; 149 + if (dgnc_board[brd]->state != BOARD_FAILED) 150 + di.info_nports = dgnc_board[brd]->nasync; 151 151 else 152 152 di.info_nports = 0; 153 153 154 - spin_unlock_irqrestore(&dgnc_Board[brd]->bd_lock, flags); 154 + spin_unlock_irqrestore(&dgnc_board[brd]->bd_lock, flags); 155 155 156 156 if (copy_to_user(uarg, &di, sizeof(di))) 157 157 return -EFAULT; ··· 174 174 channel = ni.channel; 175 175 176 176 /* Verify boundaries on board */ 177 - if (board >= dgnc_NumBoards) 177 + if (board >= dgnc_num_boards) 178 178 return -ENODEV; 179 179 180 180 /* Verify boundaries on channel */ 181 - if (channel >= dgnc_Board[board]->nasync) 181 + if (channel >= dgnc_board[board]->nasync) 182 182 return -ENODEV; 183 183 184 - ch = dgnc_Board[board]->channels[channel]; 184 + ch = dgnc_board[board]->channels[channel]; 185 185 186 186 if (!ch || ch->magic != DGNC_CHANNEL_MAGIC) 187 187 return -ENODEV;
+1 -1
drivers/staging/dgnc/dgnc_sysfs.c
··· 33 33 34 34 static ssize_t dgnc_driver_boards_show(struct device_driver *ddp, char *buf) 35 35 { 36 - return snprintf(buf, PAGE_SIZE, "%d\n", dgnc_NumBoards); 36 + return snprintf(buf, PAGE_SIZE, "%d\n", dgnc_num_boards); 37 37 } 38 38 static DRIVER_ATTR(boards, S_IRUSR, dgnc_driver_boards_show, NULL); 39 39