Skip to content

Commit 789f900

Browse files
gcabidduherbertx
authored andcommitted
crypto: qat - drop input parameter from adf_enable_aer()
Remove pointer to struct pci_driver from function adf_enable_aer() as it is possible to get it directly from pdev->driver. Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com> Reviewed-by: Fiona Trahe <fiona.trahe@intel.com> Reviewed-by: Wojciech Ziemba <wojciech.ziemba@intel.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
1 parent 83e6a19 commit 789f900

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

drivers/crypto/qat/qat_c3xxx/adf_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
198198
}
199199
pci_set_master(pdev);
200200

201-
if (adf_enable_aer(accel_dev, &adf_driver)) {
201+
if (adf_enable_aer(accel_dev)) {
202202
dev_err(&pdev->dev, "Failed to enable aer\n");
203203
ret = -EFAULT;
204204
goto out_err_free_reg;

drivers/crypto/qat/qat_c62x/adf_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
198198
}
199199
pci_set_master(pdev);
200200

201-
if (adf_enable_aer(accel_dev, &adf_driver)) {
201+
if (adf_enable_aer(accel_dev)) {
202202
dev_err(&pdev->dev, "Failed to enable aer\n");
203203
ret = -EFAULT;
204204
goto out_err_free_reg;

drivers/crypto/qat/qat_common/adf_aer.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,19 +175,19 @@ static const struct pci_error_handlers adf_err_handler = {
175175
/**
176176
* adf_enable_aer() - Enable Advance Error Reporting for acceleration device
177177
* @accel_dev: Pointer to acceleration device.
178-
* @adf: PCI device driver owning the given acceleration device.
179178
*
180179
* Function enables PCI Advance Error Reporting for the
181180
* QAT acceleration device accel_dev.
182181
* To be used by QAT device specific drivers.
183182
*
184183
* Return: 0 on success, error code otherwise.
185184
*/
186-
int adf_enable_aer(struct adf_accel_dev *accel_dev, struct pci_driver *adf)
185+
int adf_enable_aer(struct adf_accel_dev *accel_dev)
187186
{
188187
struct pci_dev *pdev = accel_to_pci_dev(accel_dev);
188+
struct pci_driver *pdrv = pdev->driver;
189189

190-
adf->err_handler = &adf_err_handler;
190+
pdrv->err_handler = &adf_err_handler;
191191
pci_enable_pcie_error_reporting(pdev);
192192
return 0;
193193
}

drivers/crypto/qat/qat_common/adf_common_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ void adf_ae_fw_release(struct adf_accel_dev *accel_dev);
9595
int adf_ae_start(struct adf_accel_dev *accel_dev);
9696
int adf_ae_stop(struct adf_accel_dev *accel_dev);
9797

98-
int adf_enable_aer(struct adf_accel_dev *accel_dev, struct pci_driver *adf);
98+
int adf_enable_aer(struct adf_accel_dev *accel_dev);
9999
void adf_disable_aer(struct adf_accel_dev *accel_dev);
100100
void adf_reset_sbr(struct adf_accel_dev *accel_dev);
101101
void adf_reset_flr(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_dh895xcc/adf_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
200200
}
201201
pci_set_master(pdev);
202202

203-
if (adf_enable_aer(accel_dev, &adf_driver)) {
203+
if (adf_enable_aer(accel_dev)) {
204204
dev_err(&pdev->dev, "Failed to enable aer\n");
205205
ret = -EFAULT;
206206
goto out_err_free_reg;

0 commit comments

Comments
 (0)