mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
hwmon: (smsc47m1) Rename global platform device variable
pdev is a bad name for a global variable. Still more as the driver has functions where pdev is a local variable. Rename it to smsc47m1_pdev. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Link: https://lore.kernel.org/r/68a959b56da7f9452557d08c72249182364b0dd0.1701957841.git.u.kleine-koenig@pengutronix.de Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
parent
581076958e
commit
7ae587eb16
1 changed files with 8 additions and 8 deletions
|
@ -33,7 +33,7 @@ static unsigned short force_id;
|
||||||
module_param(force_id, ushort, 0);
|
module_param(force_id, ushort, 0);
|
||||||
MODULE_PARM_DESC(force_id, "Override the detected device ID");
|
MODULE_PARM_DESC(force_id, "Override the detected device ID");
|
||||||
|
|
||||||
static struct platform_device *pdev;
|
static struct platform_device *smsc47m1_pdev;
|
||||||
|
|
||||||
#define DRVNAME "smsc47m1"
|
#define DRVNAME "smsc47m1"
|
||||||
enum chips { smsc47m1, smsc47m2 };
|
enum chips { smsc47m1, smsc47m2 };
|
||||||
|
@ -884,10 +884,10 @@ static int __init smsc47m1_device_add(unsigned short address,
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
|
||||||
pdev = platform_device_register_full(&pdevinfo);
|
smsc47m1_pdev = platform_device_register_full(&pdevinfo);
|
||||||
if (IS_ERR(pdev)) {
|
if (IS_ERR(smsc47m1_pdev)) {
|
||||||
pr_err("Device allocation failed\n");
|
pr_err("Device allocation failed\n");
|
||||||
return PTR_ERR(pdev);
|
return PTR_ERR(smsc47m1_pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -904,7 +904,7 @@ static int __init sm_smsc47m1_init(void)
|
||||||
return err;
|
return err;
|
||||||
address = err;
|
address = err;
|
||||||
|
|
||||||
/* Sets global pdev as a side effect */
|
/* Sets global smsc47m1_pdev as a side effect */
|
||||||
err = smsc47m1_device_add(address, &sio_data);
|
err = smsc47m1_device_add(address, &sio_data);
|
||||||
if (err)
|
if (err)
|
||||||
return err;
|
return err;
|
||||||
|
@ -916,7 +916,7 @@ static int __init sm_smsc47m1_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
exit_device:
|
exit_device:
|
||||||
platform_device_unregister(pdev);
|
platform_device_unregister(smsc47m1_pdev);
|
||||||
smsc47m1_restore(&sio_data);
|
smsc47m1_restore(&sio_data);
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
@ -924,8 +924,8 @@ static int __init sm_smsc47m1_init(void)
|
||||||
static void __exit sm_smsc47m1_exit(void)
|
static void __exit sm_smsc47m1_exit(void)
|
||||||
{
|
{
|
||||||
platform_driver_unregister(&smsc47m1_driver);
|
platform_driver_unregister(&smsc47m1_driver);
|
||||||
smsc47m1_restore(dev_get_platdata(&pdev->dev));
|
smsc47m1_restore(dev_get_platdata(&smsc47m1_pdev->dev));
|
||||||
platform_device_unregister(pdev);
|
platform_device_unregister(smsc47m1_pdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
|
MODULE_AUTHOR("Mark D. Studebaker <mdsxyz123@yahoo.com>");
|
||||||
|
|
Loading…
Reference in a new issue