Commit 6584c8af authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

greybus: s/greybus_device_id/greybus_module_id/g

parent d5877800

drivers/staging/greybus/core.c

+6 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/greybus/gpio-gb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/greybus/greybus.h

+6 −6
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/greybus_id.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/mod_devicetable.h>





struct greybus_device_id {

struct greybus_module_id {

	__u16	match_flags;

	__u16	wVendor;

	__u16	wProduct;

drivers/staging/greybus/i2c-gb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;