hwmon: (nct6775) Support two SuperIO chips in the same system
Guenter Roeck
maintainerPATCH 1/3 hwmon: (nct6775) Support two SuperIO chips in the same system
Signed-off-by Guenter Roeck <[email protected]>
--- drivers/hwmon/nct6775.c | 100 ++++++++++++++++++++++++++--------------------- 1 file changed, 56 insertions(+), 44 deletions(-)
drivers/hwmon/nct6775.c +56 -44
@@ -3486,8 +3486,8 @@ static int __init nct6775_find(int sioaddr, unsigned short *addr, }superio_exit (sioaddr); -pr_info ("Found %s or compatible chip at %#x\n" , - nct6775_sio_names[sio_data->kind], *addr); +pr_info ("Found %s or compatible chip at %#x:%#x\n" , + nct6775_sio_names[sio_data->kind], sioaddr, *addr); sio_data->sioreg = sioaddr;return 0 ;
@@ -3499,14 +3499,20 @@ static int __init nct6775_find(int sioaddr, unsigned short *addr,* track of the nct6775 driver. But since we platform_device_alloc(), we * must keep track of the device */ -static struct platform_device *pdev; +static struct platform_device *pdev[2 ];static int __init sensors_nct6775_init (void ) { -int err; +int i, err; +bool found = false;unsigned short address;struct resource res;struct nct6775_sio_data sio_data; +int sioaddr[2 ] = {0x2e ,0x4e }; + + err =platform_driver_register (&nct6775_driver); +if (err) +return err;/* * initialize sio_data->kind and sio_data->sioreg.
@@ -3515,64 +3521,70 @@ static int __init sensors_nct6775_init(void)* driver will probe 0x2e and 0x4e and auto-detect the presence of a * nct6775 hardware monitor, and call probe() */ -if (nct6775_find (0x2e , &address, &sio_data) && -nct6775_find (0x4e , &address, &sio_data)) -return -ENODEV ; - - err =platform_driver_register (&nct6775_driver); -if (err) - goto exit; +for (i =0 ; i <ARRAY_SIZE (pdev); i++) { +if (nct6775_find (sioaddr[i], &address, &sio_data)) +continue ; - pdev =platform_device_alloc (DRVNAME , address); -if (!pdev) { - err = -ENOMEM ; -pr_err ("Device allocation failed\n" ); - goto exit_unregister; - } + found = true; - err =platform_device_add_data (pdev, &sio_data, -sizeof (struct nct6775_sio_data )); -if (err) { -pr_err ("Platform data allocation failed\n" ); - goto exit_device_put; - } + pdev[i] =platform_device_alloc (DRVNAME , address); +if (!pdev[i]) { + err = -ENOMEM ; + goto exit_device_put; + } -memset (&res,0 ,sizeof (res)); - res.name =DRVNAME ; - res.start = address +IOREGION_OFFSET ; - res.end = address +IOREGION_OFFSET +IOREGION_LENGTH -1 ; - res.flags =IORESOURCE_IO ; + err =platform_device_add_data (pdev[i], &sio_data, +sizeof (struct nct6775_sio_data )); +if (err) + goto exit_device_put; + +memset (&res,0 ,sizeof (res)); + res.name =DRVNAME ; + res.start = address +IOREGION_OFFSET ; + res.end = address +IOREGION_OFFSET +IOREGION_LENGTH -1 ; + res.flags =IORESOURCE_IO ; + + err =acpi_check_resource_conflict (&res); +if (err) { +platform_device_put (pdev[i]); + pdev[i] =NULL ; +continue ; + } - err =acpi_check_resource_conflict (&res); -if (err) - goto exit_device_put; + err =platform_device_add_resources (pdev[i], &res,1 ); +if (err) + goto exit_device_put; - err =platform_device_add_resources (pdev, &res,1 ); -if (err) { -pr_err ("Device resource addition failed (%d)\n" , err); - goto exit_device_put; +/* platform_device_add calls probe() */ + err =platform_device_add (pdev[i]); +if (err) + goto exit_device_put; } - -/* platform_device_add calls probe() */ - err =platform_device_add (pdev); -if (err) { -pr_err ("Device addition failed (%d)\n" , err); - goto exit_device_put; +if (!found) { + err = -ENODEV ; + goto exit_unregister; }return 0 ; exit_device_put: -platform_device_put (pdev); +for (i =0 ; i <ARRAY_SIZE (pdev); i++) { +if (pdev[i]) +platform_device_put (pdev[i]); + } exit_unregister:platform_driver_unregister (&nct6775_driver); -exit:return err; } static void __exit sensors_nct6775_exit(void) { -platform_device_unregister (pdev); +int i; + +for (i =0 ; i <ARRAY_SIZE (pdev); i++) { +if (pdev[i]) +platform_device_unregister (pdev[i]); + }platform_driver_unregister (&nct6775_driver); }
Signature · 7 lines
1.7.9.7 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors