.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * Copyright (C) 2005-2006 Micronas USA Inc. |
---|
3 | | - * |
---|
4 | | - * This program is free software; you can redistribute it and/or modify |
---|
5 | | - * it under the terms of the GNU General Public License (Version 2) as |
---|
6 | | - * published by the Free Software Foundation. |
---|
7 | | - * |
---|
8 | | - * This program is distributed in the hope that it will be useful, |
---|
9 | | - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
---|
10 | | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
---|
11 | | - * GNU General Public License for more details. |
---|
12 | 4 | */ |
---|
13 | 5 | |
---|
14 | 6 | #include "saa7134.h" |
---|
.. | .. |
---|
435 | 427 | |
---|
436 | 428 | go->board_id = GO7007_BOARDID_PCI_VOYAGER; |
---|
437 | 429 | snprintf(go->bus_info, sizeof(go->bus_info), "PCI:%s", pci_name(dev->pci)); |
---|
438 | | - strlcpy(go->name, saa7134_boards[dev->board].name, sizeof(go->name)); |
---|
| 430 | + strscpy(go->name, saa7134_boards[dev->board].name, sizeof(go->name)); |
---|
439 | 431 | go->hpi_ops = &saa7134_go7007_hpi_ops; |
---|
440 | 432 | go->hpi_context = saa; |
---|
441 | 433 | saa->dev = dev; |
---|
.. | .. |
---|
444 | 436 | sd = &saa->sd; |
---|
445 | 437 | v4l2_subdev_init(sd, &saa7134_go7007_sd_ops); |
---|
446 | 438 | v4l2_set_subdevdata(sd, saa); |
---|
447 | | - strncpy(sd->name, "saa7134-go7007", sizeof(sd->name)); |
---|
| 439 | + strscpy(sd->name, "saa7134-go7007", sizeof(sd->name)); |
---|
448 | 440 | |
---|
449 | 441 | /* Allocate a couple pages for receiving the compressed stream */ |
---|
450 | 442 | saa->top = (u8 *)get_zeroed_page(GFP_KERNEL); |
---|
.. | .. |
---|
501 | 493 | free_page((unsigned long)saa->bottom); |
---|
502 | 494 | v4l2_device_unregister_subdev(&saa->sd); |
---|
503 | 495 | kfree(saa); |
---|
504 | | - video_unregister_device(&go->vdev); |
---|
| 496 | + vb2_video_unregister_device(&go->vdev); |
---|
505 | 497 | |
---|
506 | 498 | v4l2_device_put(&go->v4l2_dev); |
---|
507 | 499 | dev->empress_dev = NULL; |
---|