Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code »

Commit abd6633c67925f90775bb74755f9c547e30f1f20

Authored by David Härdeman
Committed by Linus Torvalds
1 parent a976f150a6
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

pnp: add a shutdown method to pnp drivers 

The shutdown method is used by the winbond cir driver to setup the
hardware for wake-from-S5.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: David Härdeman <david@hardeman.nu>
Cc: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 11 additions and 0 deletions Side-by-side Diff

drivers/pnp/driver.c
Diff comments   View file @ abd6633
... ... @@ -135,6 +135,15 @@
135 135 return 0;
136 136 }
137 137  
  138 +static void pnp_device_shutdown(struct device *dev)
  139 +{
  140 + struct pnp_dev *pnp_dev = to_pnp_dev(dev);
  141 + struct pnp_driver *drv = pnp_dev->driver;
  142 +
  143 + if (drv && drv->shutdown)
  144 + drv->shutdown(pnp_dev);
  145 +}
  146 +
138 147 static int pnp_bus_match(struct device *dev, struct device_driver *drv)
139 148 {
140 149 struct pnp_dev *pnp_dev = to_pnp_dev(dev);
... ... @@ -203,6 +212,7 @@
203 212 .match = pnp_bus_match,
204 213 .probe = pnp_device_probe,
205 214 .remove = pnp_device_remove,
  215 + .shutdown = pnp_device_shutdown,
206 216 .suspend = pnp_bus_suspend,
207 217 .resume = pnp_bus_resume,
208 218 .dev_attrs = pnp_interface_attrs,
... ... @@ -360,6 +360,7 @@
360 360 unsigned int flags;
361 361 int (*probe) (struct pnp_dev *dev, const struct pnp_device_id *dev_id);
362 362 void (*remove) (struct pnp_dev *dev);
  363 + void (*shutdown) (struct pnp_dev *dev);
363 364 int (*suspend) (struct pnp_dev *dev, pm_message_t state);
364 365 int (*resume) (struct pnp_dev *dev);
365 366 struct device_driver driver;