.. | .. |
---|
8 | 8 | * Copyright (c) 2007 Novell Inc. |
---|
9 | 9 | */ |
---|
10 | 10 | |
---|
| 11 | +#include <linux/device/driver.h> |
---|
11 | 12 | #include <linux/device.h> |
---|
12 | 13 | #include <linux/module.h> |
---|
13 | 14 | #include <linux/errno.h> |
---|
.. | .. |
---|
73 | 74 | * return to the caller and not iterate over any more devices. |
---|
74 | 75 | */ |
---|
75 | 76 | struct device *driver_find_device(struct device_driver *drv, |
---|
76 | | - struct device *start, void *data, |
---|
77 | | - int (*match)(struct device *dev, void *data)) |
---|
| 77 | + struct device *start, const void *data, |
---|
| 78 | + int (*match)(struct device *dev, const void *data)) |
---|
78 | 79 | { |
---|
79 | 80 | struct klist_iter i; |
---|
80 | 81 | struct device *dev; |
---|
.. | .. |
---|
157 | 158 | if ((drv->bus->probe && drv->probe) || |
---|
158 | 159 | (drv->bus->remove && drv->remove) || |
---|
159 | 160 | (drv->bus->shutdown && drv->shutdown)) |
---|
160 | | - printk(KERN_WARNING "Driver '%s' needs updating - please use " |
---|
| 161 | + pr_warn("Driver '%s' needs updating - please use " |
---|
161 | 162 | "bus_type methods\n", drv->name); |
---|
162 | 163 | |
---|
163 | 164 | other = driver_find(drv->name, drv->bus); |
---|
164 | 165 | if (other) { |
---|
165 | | - printk(KERN_ERR "Error: Driver '%s' is already registered, " |
---|
| 166 | + pr_err("Error: Driver '%s' is already registered, " |
---|
166 | 167 | "aborting...\n", drv->name); |
---|
167 | 168 | return -EBUSY; |
---|
168 | 169 | } |
---|