ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 04:33:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

media: pci/saa716x: Replace strlcpy() with strscpy()

Browse Source
This commit is contained in:
CrazyCat
2024-03-10 20:57:52 +02:00
parent 82aaaf6cb3
commit b3d6de4067
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/media/pci/saa716x/saa716x_budget.c
View File

@@ -760,7 +760,7 @@ static int saa716x_tbs6284_frontend_attach(struct saa716x_adapter *adapter, int
}
adapter->i2c_client_tuner = client;
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -868,7 +868,7 @@ static int saa716x_tbs6280_frontend_attach(struct saa716x_adapter *adapter, int
}
adapter->i2c_client_tuner = client;
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -939,7 +939,7 @@ static int saa716x_tbs6221_frontend_attach(struct saa716x_adapter *adapter, int
si2168_config.ts_mode = SI2168_TS_PARALLEL;
si2168_config.ts_clock_gapped = true;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE);
strscpy(info.type, "si2168", I2C_NAME_SIZE);
info.addr = 0x64;
info.platform_data = &si2168_config;
request_module(info.type);
@@ -958,7 +958,7 @@ static int saa716x_tbs6221_frontend_attach(struct saa716x_adapter *adapter, int
si2157_config.fe = adapter->fe;
si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
strscpy(info.type, "si2157", I2C_NAME_SIZE);
info.addr = 0x60;
info.platform_data = &si2157_config;
request_module(info.type);
@@ -976,7 +976,7 @@ static int saa716x_tbs6221_frontend_attach(struct saa716x_adapter *adapter, int
}
adapter->i2c_client_tuner = client;
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1061,7 +1061,7 @@ static int saa716x_tbs6281_frontend_attach(struct saa716x_adapter *adapter, int
si2168_config.ts_mode = SI2168_TS_PARALLEL;
si2168_config.ts_clock_gapped = true;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE);
strscpy(info.type, "si2168", I2C_NAME_SIZE);
info.addr = 0x64;
info.platform_data = &si2168_config;
request_module(info.type);
@@ -1080,7 +1080,7 @@ static int saa716x_tbs6281_frontend_attach(struct saa716x_adapter *adapter, int
si2157_config.fe = adapter->fe;
si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
strscpy(info.type, "si2157", I2C_NAME_SIZE);
info.addr = 0x60;
info.platform_data = &si2157_config;
request_module(info.type);
@@ -1098,7 +1098,7 @@ static int saa716x_tbs6281_frontend_attach(struct saa716x_adapter *adapter, int
}
adapter->i2c_client_tuner = client;
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1164,7 +1164,7 @@ static int saa716x_tbs6285_frontend_attach(struct saa716x_adapter *adapter, int
si2168_config.ts_clock_gapped = true;
si2168_config.ts_clock_inv = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE);
strscpy(info.type, "si2168", I2C_NAME_SIZE);
info.addr = ((count == 0) || (count == 2)) ? 0x64 : 0x66;
info.platform_data = &si2168_config;
request_module(info.type);
@@ -1186,7 +1186,7 @@ static int saa716x_tbs6285_frontend_attach(struct saa716x_adapter *adapter, int
si2157_config.fe = adapter->fe;
si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
strscpy(info.type, "si2157", I2C_NAME_SIZE);
info.addr = ((count == 0) || (count == 2)) ? 0x62 : 0x60;
info.platform_data = &si2157_config;
request_module(info.type);
@@ -1207,7 +1207,7 @@ static int saa716x_tbs6285_frontend_attach(struct saa716x_adapter *adapter, int
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
dev->config->model_name, count);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
if (!saa716x_tbs_read_mac(dev,count,mac)) {
@@ -1299,7 +1299,7 @@ static int saa716x_tbs6220_frontend_attach(struct saa716x_adapter *adapter, int
}
adapter->i2c_client_tuner = client;
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1407,7 +1407,7 @@ static int saa716x_tbs6922_frontend_attach(
goto err;
}
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1509,7 +1509,7 @@ static int saa716x_tbs6923_frontend_attach(
goto err;
}
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1640,7 +1640,7 @@ static int tbs6925_frontend_attach(struct saa716x_adapter *adapter,
if (adapter->fe->ops.init)
adapter->fe->ops.init(adapter->fe);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1786,7 +1786,7 @@ static int saa716x_tbs6982_frontend_attach(
goto err;
}
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -1931,7 +1931,7 @@ static int saa716x_tbs6982se_frontend_attach(
goto err;
}
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -2112,7 +2112,7 @@ static int saa716x_tbs6984_frontend_attach(
"%s frontend %d doesn't seem to have a isl6422b on the i2c bus.\n",
dev->config->model_name, count);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
if (!saa716x_tbs_read_mac(dev,count,mac)) {
@@ -2318,7 +2318,7 @@ static int saa716x_tbs6985_frontend_attach(struct saa716x_adapter *adapter, int
dev_notice(&dev->pdev->dev, "%s MAC=%pM\n", dev->config->model_name, adapter->dvb_adapter.proposed_mac);
}
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
return 0;
@@ -2488,7 +2488,7 @@ static int saa716x_tbs6991_frontend_attach(
if(!ret)
tbsci_init(adapter,count,2);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -2588,7 +2588,7 @@ static int saa716x_tbs6991se_frontend_attach(
if(!ret)
tbsci_init(adapter,count,8);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -2723,7 +2723,7 @@ static int saa716x_tbs6983_frontend_attach(struct saa716x_adapter *adapter, int
adapter->fe->ops.set_voltage = saa716x_tbs6983_set_voltage;
saa716x_gpio_write(dev, count ? 2 : 3, 1); /* LNB power off */
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",
@@ -2784,7 +2784,7 @@ static int saa716x_tbs6290_frontend_attach(struct saa716x_adapter *adapter, int
si2168_config.ts_mode = SI2168_TS_PARALLEL;
si2168_config.ts_clock_gapped = true;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2168", I2C_NAME_SIZE);
strscpy(info.type, "si2168", I2C_NAME_SIZE);
info.addr = 0x64;
info.platform_data = &si2168_config;
request_module(info.type);
@@ -2803,7 +2803,7 @@ static int saa716x_tbs6290_frontend_attach(struct saa716x_adapter *adapter, int
si2157_config.fe = adapter->fe;
si2157_config.if_port = 1;
memset(&info, 0, sizeof(struct i2c_board_info));
strlcpy(info.type, "si2157", I2C_NAME_SIZE);
strscpy(info.type, "si2157", I2C_NAME_SIZE);
info.addr = 0x60;
info.platform_data = &si2157_config;
request_module(info.type);
@@ -2831,7 +2831,7 @@ static int saa716x_tbs6290_frontend_attach(struct saa716x_adapter *adapter, int
if(!ret)
tbsci_init(adapter,count,9);
strlcpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strscpy(adapter->fe->ops.info.name,dev->config->model_name,52);
strlcat(adapter->fe->ops.info.name,dev->config->dev_type,52);
dev_dbg(&dev->pdev->dev, "%s frontend %d attached\n",

2
drivers/media/pci/saa716x/tbsci-i2c.c
View File

@@ -89,7 +89,7 @@ int tbsci_i2c_probe(struct saa716x_adapter *adap, int tbsci_i2c_nr)
sizeof(tbsci_i2c->algo));
tbsci_i2c->adap.dev.parent = &saa716x->pdev->dev;
strlcpy(tbsci_i2c->adap.name,
strscpy(tbsci_i2c->adap.name,
tbsci_i2c_nr ? "TBSCI I2C Adapter 0" : "TBSCI I2C Adapter 1",
sizeof(tbsci_i2c->adap.name));
tbsci_i2c->adap.owner = THIS_MODULE;