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

Commit b222cca6 authored by Joe Perches's avatar Joe Perches Committed by Matthew Garrett
Browse files

platform:x86: Remove OOM message after input_allocate_device 



Emitting an OOM message isn't necessary after input_allocate_device
as there's a generic OOM and a dump_stack already done.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMatthew Garrett <matthew.garrett@nebula.com>
parent a825bc87

drivers/platform/x86/asus-laptop.c

+2 −3
Original line number Diff line number Diff line
@@ -1494,10 +1494,9 @@ static int asus_input_init(struct asus_laptop *asus) 
	int error;



	input = input_allocate_device();

	if (!input) {

		pr_warn("Unable to allocate input device\n");

	if (!input)

		return -ENOMEM;

	}



	input->name = "Asus Laptop extra buttons";

	input->phys = ASUS_LAPTOP_FILE "/input0";

	input->id.bustype = BUS_HOST;

drivers/platform/x86/eeepc-laptop.c

+1 −3
Original line number Diff line number Diff line
@@ -1203,10 +1203,8 @@ static int eeepc_input_init(struct eeepc_laptop *eeepc) 
	int error;



	input = input_allocate_device();

	if (!input) {

		pr_info("Unable to allocate input device\n");

	if (!input)

		return -ENOMEM;

	}



	input->name = "Asus EeePC extra buttons";

	input->phys = EEEPC_LAPTOP_FILE "/input0";

drivers/platform/x86/ideapad-laptop.c

+1 −3
Original line number Diff line number Diff line
@@ -570,10 +570,8 @@ static int ideapad_input_init(struct ideapad_private *priv) 
	int error;



	inputdev = input_allocate_device();

	if (!inputdev) {

		pr_info("Unable to allocate input device\n");

	if (!inputdev)

		return -ENOMEM;

	}



	inputdev->name = "Ideapad extra buttons";

	inputdev->phys = "ideapad/input0";

drivers/platform/x86/intel_mid_powerbtn.c

+1 −3
Original line number Diff line number Diff line
@@ -66,10 +66,8 @@ static int mfld_pb_probe(struct platform_device *pdev) 
		return -EINVAL;



	input = input_allocate_device();

	if (!input) {

		dev_err(&pdev->dev, "Input device allocation error\n");

	if (!input)

		return -ENOMEM;

	}



	input->name = pdev->name;

	input->phys = "power-button/input0";

drivers/platform/x86/panasonic-laptop.c

+1 −4
Original line number Diff line number Diff line
@@ -490,11 +490,8 @@ static int acpi_pcc_init_input(struct pcc_acpi *pcc) 
	int error;



	input_dev = input_allocate_device();

	if (!input_dev) {

		ACPI_DEBUG_PRINT((ACPI_DB_ERROR,

				  "Couldn't allocate input device for hotkey"));

	if (!input_dev)

		return -ENOMEM;

	}



	input_dev->name = ACPI_PCC_DRIVER_NAME;

	input_dev->phys = ACPI_PCC_INPUT_PHYS;