aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/tifm_core.c
diff options
context:
space:
mode:
authorAlex Dubov <oakad@yahoo.com>2007-04-12 03:05:26 -0400
committerPierre Ossman <drzeus@drzeus.cx>2007-05-01 07:04:15 -0400
commit91f8d0118a0e1f25f809f3fde5a7616a1eaabc2b (patch)
tree9388456276e9384e190d88f7ef8e229768d9362e /drivers/misc/tifm_core.c
parent13cdf48ef15befbd36f8295091b9e0f9bd322963 (diff)
tifm: layout fixes, small changes to comments and printfs
Cosmetic changes to the code. Signed-off-by: Alex Dubov <oakad@yahoo.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
Diffstat (limited to 'drivers/misc/tifm_core.c')
-rw-r--r--drivers/misc/tifm_core.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index 70220beb3e04..d195fb088f4a 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -115,23 +115,23 @@ static int tifm_device_remove(struct device *dev)
115 115
116static int tifm_device_suspend(struct device *dev, pm_message_t state) 116static int tifm_device_suspend(struct device *dev, pm_message_t state)
117{ 117{
118 struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev); 118 struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
119 struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver, 119 struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
120 driver); 120 driver);
121 121
122 if (dev->driver && drv->suspend) 122 if (dev->driver && drv->suspend)
123 return drv->suspend(fm_dev, state); 123 return drv->suspend(sock, state);
124 return 0; 124 return 0;
125} 125}
126 126
127static int tifm_device_resume(struct device *dev) 127static int tifm_device_resume(struct device *dev)
128{ 128{
129 struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev); 129 struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev);
130 struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver, 130 struct tifm_driver *drv = container_of(dev->driver, struct tifm_driver,
131 driver); 131 driver);
132 132
133 if (dev->driver && drv->resume) 133 if (dev->driver && drv->resume)
134 return drv->resume(fm_dev); 134 return drv->resume(sock);
135 return 0; 135 return 0;
136} 136}
137 137
@@ -155,14 +155,14 @@ static struct device_attribute tifm_dev_attrs[] = {
155}; 155};
156 156
157static struct bus_type tifm_bus_type = { 157static struct bus_type tifm_bus_type = {
158 .name = "tifm", 158 .name = "tifm",
159 .dev_attrs = tifm_dev_attrs, 159 .dev_attrs = tifm_dev_attrs,
160 .match = tifm_bus_match, 160 .match = tifm_bus_match,
161 .uevent = tifm_uevent, 161 .uevent = tifm_uevent,
162 .probe = tifm_device_probe, 162 .probe = tifm_device_probe,
163 .remove = tifm_device_remove, 163 .remove = tifm_device_remove,
164 .suspend = tifm_device_suspend, 164 .suspend = tifm_device_suspend,
165 .resume = tifm_device_resume 165 .resume = tifm_device_resume
166}; 166};
167 167
168static void tifm_free(struct class_device *cdev) 168static void tifm_free(struct class_device *cdev)