redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

greybus: s/greybus_device_id/greybus_module_id/g

hifive-unleashed-5.1
Greg Kroah-Hartman 2014-09-01 13:31:31 -07:00
parent d58778002b
commit 6584c8af70
7 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/staging/greybus/core.c
View File

@ -31,7 +31,7 @@ int greybus_disabled(void)
EXPORT_SYMBOL_GPL(greybus_disabled);
static int greybus_match_one_id(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
struct greybus_descriptor *des = &gdev->descriptor;
@ -50,9 +50,9 @@ static int greybus_match_one_id(struct greybus_device *gdev,
return 1;
}
static const struct greybus_device_id *greybus_match_id(
static const struct greybus_module_id *greybus_match_id(
struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
if (id == NULL)
return NULL;
@ -70,7 +70,7 @@ static int greybus_device_match(struct device *dev, struct device_driver *drv)
{
struct greybus_driver *driver = to_greybus_driver(dev->driver);
struct greybus_device *gdev = to_greybus_device(dev);
const struct greybus_device_id *id;
const struct greybus_module_id *id;
id = greybus_match_id(gdev, driver->id_table);
if (id)
@ -97,7 +97,7 @@ static int greybus_probe(struct device *dev)
{
struct greybus_driver *driver = to_greybus_driver(dev->driver);
struct greybus_device *gdev = to_greybus_device(dev);
const struct greybus_device_id *id;
const struct greybus_module_id *id;
int retval;
/* match id */
@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(greybus_deregister);
static int new_device(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
int retval;

4
drivers/staging/greybus/gpio-gb.c
View File

@ -20,7 +20,7 @@ struct gb_gpio_device {
// FIXME - some lock?
};
static const struct greybus_device_id id_table[] = {
static const struct greybus_module_id id_table[] = {
{ GREYBUS_DEVICE(0x44, 0x44) }, /* make shit up */
{ }, /* terminating NULL entry */
};
@ -52,7 +52,7 @@ static void gpio_set(struct gpio_chip *gpio, unsigned nr, int val)
}
int gb_gpio_probe(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
struct gb_gpio_device *gb_gpio;
struct gpio_chip *gpio;

12
drivers/staging/greybus/greybus.h
View File

@ -115,13 +115,13 @@ struct greybus_driver {
const char *name;
int (*probe)(struct greybus_device *gdev,
const struct greybus_device_id *id);
const struct greybus_module_id *id);
void (*disconnect)(struct greybus_device *gdev);
int (*suspend)(struct greybus_device *gdev, pm_message_t message);
int (*resume)(struct greybus_device *gdev);
const struct greybus_device_id *id_table;
const struct greybus_module_id *id_table;
struct device_driver driver;
};
@ -173,13 +173,13 @@ void gb_debugfs_cleanup(void);
* we have static functions for this, not "dynamic" drivers like we really
* should in the end.
*/
int gb_i2c_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
int gb_i2c_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
void gb_i2c_disconnect(struct greybus_device *gdev);
int gb_gpio_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
int gb_gpio_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
void gb_gpio_disconnect(struct greybus_device *gdev);
int gb_sdio_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
int gb_sdio_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
void gb_sdio_disconnect(struct greybus_device *gdev);
int gb_tty_probe(struct greybus_device *gdev, const struct greybus_device_id *id);
int gb_tty_probe(struct greybus_device *gdev, const struct greybus_module_id *id);
void gb_tty_disconnect(struct greybus_device *gdev);
int gb_tty_init(void);

2
drivers/staging/greybus/greybus_id.h
View File

@ -9,7 +9,7 @@
#include <linux/mod_devicetable.h>
struct greybus_device_id {
struct greybus_module_id {
__u16 match_flags;
__u16 wVendor;
__u16 wProduct;

4
drivers/staging/greybus/i2c-gb.c
View File

@ -17,7 +17,7 @@ struct gb_i2c_device {
struct greybus_device *gdev;
};
static const struct greybus_device_id id_table[] = {
static const struct greybus_module_id id_table[] = {
{ GREYBUS_DEVICE(0x42, 0x42) }, /* make shit up */
{ }, /* terminating NULL entry */
};
@ -76,7 +76,7 @@ static const struct i2c_algorithm smbus_algorithm = {
};
int gb_i2c_probe(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
struct gb_i2c_device *gb_i2c_dev;
struct i2c_adapter *adapter;

4
drivers/staging/greybus/sdio-gb.c
View File

@ -18,7 +18,7 @@ struct gb_sdio_host {
// FIXME - some lock?
};
static const struct greybus_device_id id_table[] = {
static const struct greybus_module_id id_table[] = {
{ GREYBUS_DEVICE(0x43, 0x43) }, /* make shit up */
{ }, /* terminating NULL entry */
};
@ -46,7 +46,7 @@ static const struct mmc_host_ops gb_sd_ops = {
};
int gb_sdio_probe(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
struct mmc_host *mmc;
struct gb_sdio_host *host;

4
drivers/staging/greybus/uart-gb.c
View File

@ -46,7 +46,7 @@ struct gb_tty {
struct mutex mutex;
};
static const struct greybus_device_id id_table[] = {
static const struct greybus_module_id id_table[] = {
{ GREYBUS_DEVICE(0x45, 0x45) }, /* make shit up */
{ }, /* terminating NULL entry */
};
@ -383,7 +383,7 @@ static const struct tty_operations gb_ops = {
int gb_tty_probe(struct greybus_device *gdev,
const struct greybus_device_id *id)
const struct greybus_module_id *id)
{
struct gb_tty *gb_tty;
struct device *tty_dev;