mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
greybus: s/greybus_device_id/greybus_module_id/g
This commit is contained in:
parent
d58778002b
commit
6584c8af70
7 changed files with 21 additions and 21 deletions
|
@ -31,7 +31,7 @@ int greybus_disabled(void)
|
||||||
EXPORT_SYMBOL_GPL(greybus_disabled);
|
EXPORT_SYMBOL_GPL(greybus_disabled);
|
||||||
|
|
||||||
static int greybus_match_one_id(struct greybus_device *gdev,
|
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;
|
struct greybus_descriptor *des = &gdev->descriptor;
|
||||||
|
|
||||||
|
@ -50,9 +50,9 @@ static int greybus_match_one_id(struct greybus_device *gdev,
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct greybus_device_id *greybus_match_id(
|
static const struct greybus_module_id *greybus_match_id(
|
||||||
struct greybus_device *gdev,
|
struct greybus_device *gdev,
|
||||||
const struct greybus_device_id *id)
|
const struct greybus_module_id *id)
|
||||||
{
|
{
|
||||||
if (id == NULL)
|
if (id == NULL)
|
||||||
return 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_driver *driver = to_greybus_driver(dev->driver);
|
||||||
struct greybus_device *gdev = to_greybus_device(dev);
|
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);
|
id = greybus_match_id(gdev, driver->id_table);
|
||||||
if (id)
|
if (id)
|
||||||
|
@ -97,7 +97,7 @@ static int greybus_probe(struct device *dev)
|
||||||
{
|
{
|
||||||
struct greybus_driver *driver = to_greybus_driver(dev->driver);
|
struct greybus_driver *driver = to_greybus_driver(dev->driver);
|
||||||
struct greybus_device *gdev = to_greybus_device(dev);
|
struct greybus_device *gdev = to_greybus_device(dev);
|
||||||
const struct greybus_device_id *id;
|
const struct greybus_module_id *id;
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
/* match id */
|
/* match id */
|
||||||
|
@ -152,7 +152,7 @@ EXPORT_SYMBOL_GPL(greybus_deregister);
|
||||||
|
|
||||||
|
|
||||||
static int new_device(struct greybus_device *gdev,
|
static int new_device(struct greybus_device *gdev,
|
||||||
const struct greybus_device_id *id)
|
const struct greybus_module_id *id)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ struct gb_gpio_device {
|
||||||
// FIXME - some lock?
|
// 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 */
|
{ GREYBUS_DEVICE(0x44, 0x44) }, /* make shit up */
|
||||||
{ }, /* terminating NULL entry */
|
{ }, /* 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,
|
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 gb_gpio_device *gb_gpio;
|
||||||
struct gpio_chip *gpio;
|
struct gpio_chip *gpio;
|
||||||
|
|
|
@ -115,13 +115,13 @@ struct greybus_driver {
|
||||||
const char *name;
|
const char *name;
|
||||||
|
|
||||||
int (*probe)(struct greybus_device *gdev,
|
int (*probe)(struct greybus_device *gdev,
|
||||||
const struct greybus_device_id *id);
|
const struct greybus_module_id *id);
|
||||||
void (*disconnect)(struct greybus_device *gdev);
|
void (*disconnect)(struct greybus_device *gdev);
|
||||||
|
|
||||||
int (*suspend)(struct greybus_device *gdev, pm_message_t message);
|
int (*suspend)(struct greybus_device *gdev, pm_message_t message);
|
||||||
int (*resume)(struct greybus_device *gdev);
|
int (*resume)(struct greybus_device *gdev);
|
||||||
|
|
||||||
const struct greybus_device_id *id_table;
|
const struct greybus_module_id *id_table;
|
||||||
|
|
||||||
struct device_driver driver;
|
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
|
* we have static functions for this, not "dynamic" drivers like we really
|
||||||
* should in the end.
|
* 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);
|
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);
|
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);
|
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);
|
void gb_tty_disconnect(struct greybus_device *gdev);
|
||||||
|
|
||||||
int gb_tty_init(void);
|
int gb_tty_init(void);
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include <linux/mod_devicetable.h>
|
#include <linux/mod_devicetable.h>
|
||||||
|
|
||||||
|
|
||||||
struct greybus_device_id {
|
struct greybus_module_id {
|
||||||
__u16 match_flags;
|
__u16 match_flags;
|
||||||
__u16 wVendor;
|
__u16 wVendor;
|
||||||
__u16 wProduct;
|
__u16 wProduct;
|
||||||
|
|
|
@ -17,7 +17,7 @@ struct gb_i2c_device {
|
||||||
struct greybus_device *gdev;
|
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 */
|
{ GREYBUS_DEVICE(0x42, 0x42) }, /* make shit up */
|
||||||
{ }, /* terminating NULL entry */
|
{ }, /* terminating NULL entry */
|
||||||
};
|
};
|
||||||
|
@ -76,7 +76,7 @@ static const struct i2c_algorithm smbus_algorithm = {
|
||||||
};
|
};
|
||||||
|
|
||||||
int gb_i2c_probe(struct greybus_device *gdev,
|
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 gb_i2c_device *gb_i2c_dev;
|
||||||
struct i2c_adapter *adapter;
|
struct i2c_adapter *adapter;
|
||||||
|
|
|
@ -18,7 +18,7 @@ struct gb_sdio_host {
|
||||||
// FIXME - some lock?
|
// 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 */
|
{ GREYBUS_DEVICE(0x43, 0x43) }, /* make shit up */
|
||||||
{ }, /* terminating NULL entry */
|
{ }, /* terminating NULL entry */
|
||||||
};
|
};
|
||||||
|
@ -46,7 +46,7 @@ static const struct mmc_host_ops gb_sd_ops = {
|
||||||
};
|
};
|
||||||
|
|
||||||
int gb_sdio_probe(struct greybus_device *gdev,
|
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 mmc_host *mmc;
|
||||||
struct gb_sdio_host *host;
|
struct gb_sdio_host *host;
|
||||||
|
|
|
@ -46,7 +46,7 @@ struct gb_tty {
|
||||||
struct mutex mutex;
|
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 */
|
{ GREYBUS_DEVICE(0x45, 0x45) }, /* make shit up */
|
||||||
{ }, /* terminating NULL entry */
|
{ }, /* terminating NULL entry */
|
||||||
};
|
};
|
||||||
|
@ -383,7 +383,7 @@ static const struct tty_operations gb_ops = {
|
||||||
|
|
||||||
|
|
||||||
int gb_tty_probe(struct greybus_device *gdev,
|
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 gb_tty *gb_tty;
|
||||||
struct device *tty_dev;
|
struct device *tty_dev;
|
||||||
|
|
Loading…
Reference in a new issue