Commit c53c7740 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Jonathan Cameron
Browse files

iio: imu: inv_mpu6050: Drop wrong use of ACPI_PTR() 



ACPI_PTR() is more harmful than helpful. For example, in this case
if CONFIG_ACPI=n, the ID table left unused which is not what we want.

Instead of adding ifdeffery or attribute here and there, drop ACPI_PTR().

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20220203155920.18586-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 08f5fbf0

drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c

+3 −4
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
* Copyright (C) 2012 Invensense, Inc.

*/



#include <linux/acpi.h>

#include <linux/delay.h>

#include <linux/err.h>

#include <linux/i2c.h>

#include <linux/iio/iio.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/property.h>
@@ -249,11 +249,10 @@ static const struct of_device_id inv_of_match[] = { 
};

MODULE_DEVICE_TABLE(of, inv_of_match);



static const struct acpi_device_id __maybe_unused inv_acpi_match[] = {

static const struct acpi_device_id inv_acpi_match[] = {

	{"INVN6500", INV_MPU6500},

	{ },

};



MODULE_DEVICE_TABLE(acpi, inv_acpi_match);



static struct i2c_driver inv_mpu_driver = {
@@ -262,7 +261,7 @@ static struct i2c_driver inv_mpu_driver = { 
	.id_table	=	inv_mpu_id,

	.driver = {

		.of_match_table = inv_of_match,

		.acpi_match_table = ACPI_PTR(inv_acpi_match),

		.acpi_match_table = inv_acpi_match,

		.name	=	"inv-mpu6050-i2c",

		.pm     =       &inv_mpu_pmops,

	},

drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
/*

* Copyright (C) 2015 Intel Corporation Inc.

*/

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/acpi.h>

#include <linux/of.h>

#include <linux/property.h>

#include <linux/spi/spi.h>
@@ -148,7 +148,7 @@ static struct spi_driver inv_mpu_driver = { 
	.id_table	=	inv_mpu_id,

	.driver = {

		.of_match_table = inv_of_match,

		.acpi_match_table = ACPI_PTR(inv_acpi_match),

		.acpi_match_table = inv_acpi_match,

		.name	=	"inv-mpu6000-spi",

		.pm     =       &inv_mpu_pmops,

	},