platform/chrome: cros_usbpd_notify: Add driver data struct

Introduce a device driver data structure, cros_usbpd_notify_data, in
which we can store the notifier block object and pointers to the struct
cros_ec_device and struct device objects.

This will make it more convenient to access these pointers when
executing both platform and ACPI callbacks.

Signed-off-by: Prashant Malani <pmalani@chromium.org>
Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: Benson Leung <bleung@chromium.org>
This commit is contained in:
Prashant Malani 2020-03-16 01:28:30 -07:00 committed by Benson Leung
parent 92e399c07b
commit f5d84a21fa
No known key found for this signature in database
GPG Key ID: 736DAA268733B0C2
1 changed files with 19 additions and 9 deletions

View File

@ -16,6 +16,12 @@
static BLOCKING_NOTIFIER_HEAD(cros_usbpd_notifier_list); static BLOCKING_NOTIFIER_HEAD(cros_usbpd_notifier_list);
struct cros_usbpd_notify_data {
struct device *dev;
struct cros_ec_device *ec;
struct notifier_block nb;
};
/** /**
* cros_usbpd_register_notify - Register a notifier callback for PD events. * cros_usbpd_register_notify - Register a notifier callback for PD events.
* @nb: Notifier block pointer to register * @nb: Notifier block pointer to register
@ -98,18 +104,21 @@ static int cros_usbpd_notify_probe_plat(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent); struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent);
struct notifier_block *nb; struct cros_usbpd_notify_data *pdnotify;
int ret; int ret;
nb = devm_kzalloc(dev, sizeof(*nb), GFP_KERNEL); pdnotify = devm_kzalloc(dev, sizeof(*pdnotify), GFP_KERNEL);
if (!nb) if (!pdnotify)
return -ENOMEM; return -ENOMEM;
nb->notifier_call = cros_usbpd_notify_plat; pdnotify->dev = dev;
dev_set_drvdata(dev, nb); pdnotify->ec = ecdev->ec_dev;
pdnotify->nb.notifier_call = cros_usbpd_notify_plat;
dev_set_drvdata(dev, pdnotify);
ret = blocking_notifier_chain_register(&ecdev->ec_dev->event_notifier, ret = blocking_notifier_chain_register(&ecdev->ec_dev->event_notifier,
nb); &pdnotify->nb);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Failed to register notifier\n"); dev_err(dev, "Failed to register notifier\n");
return ret; return ret;
@ -122,10 +131,11 @@ static int cros_usbpd_notify_remove_plat(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent); struct cros_ec_dev *ecdev = dev_get_drvdata(dev->parent);
struct notifier_block *nb = struct cros_usbpd_notify_data *pdnotify =
(struct notifier_block *)dev_get_drvdata(dev); (struct cros_usbpd_notify_data *)dev_get_drvdata(dev);
blocking_notifier_chain_unregister(&ecdev->ec_dev->event_notifier, nb); blocking_notifier_chain_unregister(&ecdev->ec_dev->event_notifier,
&pdnotify->nb);
return 0; return 0;
} }