Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc11851 authored by Jean Delvare's avatar Jean Delvare Committed by Bjorn Helgaas
Browse files

PCI/AER: Use dev_warn() in aer_inject 



dev_warn() is better than printk(LOG_WARNING...) as it records which device
the message relates to.  Also add a prefix "aer_inject:" to help
differentiate real errors from injected errors.

Signed-off-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Borislav Petkov <bp@suse.de>
parent 20ac75e5

drivers/pci/pcie/aer/aer_inject.c

+7 −3
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/fs.h>

#include <linux/uaccess.h>

#include <linux/stddef.h>

#include <linux/device.h>

#include "aerdrv.h"



/* Override the existing corrected and uncorrected error masks */
@@ -420,14 +421,16 @@ static int aer_inject(struct aer_error_inj *einj) 
	if (!aer_mask_override && einj->cor_status &&

	    !(einj->cor_status & ~cor_mask)) {

		ret = -EINVAL;

		printk(KERN_WARNING "The correctable error(s) is masked by device\n");

		dev_warn(&dev->dev,

			 "aer_inject: The correctable error(s) is masked by device\n");

		spin_unlock_irqrestore(&inject_lock, flags);

		goto out_put;

	}

	if (!aer_mask_override && einj->uncor_status &&

	    !(einj->uncor_status & ~uncor_mask)) {

		ret = -EINVAL;

		printk(KERN_WARNING "The uncorrectable error(s) is masked by device\n");

		dev_warn(&dev->dev,

			 "aer_inject: The uncorrectable error(s) is masked by device\n");

		spin_unlock_irqrestore(&inject_lock, flags);

		goto out_put;

	}
@@ -480,7 +483,8 @@ static int aer_inject(struct aer_error_inj *einj) 


	if (find_aer_device(rpdev, &edev)) {

		if (!get_service_data(edev)) {

			printk(KERN_WARNING "AER service is not initialized\n");

			dev_warn(&edev->device,

				 "aer_inject: AER service is not initialized\n");

			ret = -EPROTONOSUPPORT;

			goto out_put;

		}