On Fri, Sep 30, 2022 at 03:46:37PM +0100, Ahmad Khalifa wrote:
> Signed-off-by: Ahmad Khalifa <ahmad@xxxxxxxxxx>
Patch description missing. What are you doing, and why ?
> ---
> drivers/hwmon/it87.c | 18 +++++++++++++++---
> 1 file changed, 15 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
> index 0e543dbe0a6b..6d71f6c481c8 100644
> --- a/drivers/hwmon/it87.c
> +++ b/drivers/hwmon/it87.c
> @@ -69,6 +69,10 @@ static unsigned short force_id;
> module_param(force_id, ushort, 0);
> MODULE_PARM_DESC(force_id, "Override the detected device ID");
>
> +static bool ignore_resource_conflict;
> +module_param(ignore_resource_conflict, bool, false);
> +MODULE_PARM_DESC(ignore_resource_conflict, "Ignore ACPI resource conflict");
> +
> static struct platform_device *it87_pdev[2];
>
> #define REG_2E 0x2e /* The register to read/write */
> @@ -2397,7 +2401,13 @@ static int __init it87_find(int sioaddr, unsigned short *address,
> return err;
>
> err = -ENODEV;
> - chip_type = force_id ? force_id : superio_inw(sioaddr, DEVID);
> + chip_type = superio_inw(sioaddr, DEVID);
> + /* check first so force_id doesn't register a second empty device */
> + if (chip_type == 0xffff)
> + goto exit;
> +
> + if (force_id)
> + chip_type = force_id;
Undocumented change, violating "one logical change per patch" rule.
>
> switch (chip_type) {
> case IT8705F_DEVID:
> @@ -3261,8 +3271,10 @@ static int __init it87_device_add(int index, unsigned short address,
> int err;
>
> err = acpi_check_resource_conflict(&res);
> - if (err)
> - return err;
> + if (err){
> + if (!ignore_resource_conflict)
> + return err;
> + }
>
> pdev = platform_device_alloc(DRVNAME, address);
> if (!pdev)
