| Message ID | 20161126181326.14951-4-Nicolae_Rosia@mentor.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sat, 26 Nov 2016, Nicolae Rosia wrote: > We want to get rid of exported symbols and have > the child devices use structure members directly. > Move the structure definitions to header and set > drvdata so child devices can access it. < Please use all 75 chars allocated to the commitlog before line wrapping > > Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com> > --- > drivers/mfd/twl-core.c | 27 ++++----------------------- > include/linux/mfd/twl-core.h | 35 +++++++++++++++++++++++++++++++++++ > 2 files changed, 39 insertions(+), 23 deletions(-) > create mode 100644 include/linux/mfd/twl-core.h > > diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c > index e16084e..409b836 100644 > --- a/drivers/mfd/twl-core.c > +++ b/drivers/mfd/twl-core.c > @@ -48,6 +48,7 @@ > > #include <linux/i2c.h> > #include <linux/i2c/twl.h> > +#include <linux/mfd/twl-core.h> > > /* Register descriptions for audio */ > #include <linux/mfd/twl4030-audio.h> > @@ -154,28 +155,7 @@ int twl4030_init_irq(struct device *dev, int irq_num); > int twl4030_exit_irq(void); > int twl4030_init_chip_irq(const char *chip); > > -/* Structure for each TWL4030/TWL6030 Slave */ > -struct twl_client { > - struct i2c_client *client; > - struct regmap *regmap; > -}; > - > -/* mapping the module id to slave id and base address */ > -struct twl_mapping { > - unsigned char sid; /* Slave ID */ > - unsigned char base; /* base address */ > -}; > - > -struct twl_private { > - bool ready; /* The core driver is ready to be used */ > - u32 twl_idcode; /* TWL IDCODE Register value */ > - unsigned int twl_id; > - > - struct twl_mapping *twl_map; > - struct twl_client *twl_modules; > -}; > - > -static struct twl_private *twl_priv; > +static struct twlcore *twl_priv; I'm guessing when you remove the exported functions, you can remove this? > static struct twl_mapping twl4030_map[] = { > /* > @@ -745,7 +725,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > goto free; > } > > - twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private), > + twl_priv = devm_kzalloc(&client->dev, sizeof(struct twlcore), > GFP_KERNEL); > if (!twl_priv) { > status = -ENOMEM; > @@ -803,6 +783,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) > } > > twl_priv->ready = true; > + dev_set_drvdata(&client->dev, twl_priv); > > /* setup clock framework */ > clocks_init(&pdev->dev); > diff --git a/include/linux/mfd/twl-core.h b/include/linux/mfd/twl-core.h > new file mode 100644 > index 0000000..d1c01b3 > --- /dev/null > +++ b/include/linux/mfd/twl-core.h > @@ -0,0 +1,35 @@ > +/* > + * MFD core driver for the Texas Instruments TWL PMIC family > + * > + * Copyright (C) 2016 Nicolae Rosia <nicolae.rosia@gmail.com> Your sign-off and SoB are different? Why? > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License version 2 as > + * published by the Free Software Foundation. > + */ > + > +#ifndef __TWL_CORE_H__ > +#define __TWL_CORE_H__ _MFD_ > +/* Structure for each TWL4030/TWL6030 Slave */ > +struct twl_client { > + struct i2c_client *client; > + struct regmap *regmap; > +}; > + > +/* mapping the module id to slave id and base address */ > +struct twl_mapping { > + unsigned char sid; /* Slave ID */ > + unsigned char base; /* base address */ > +}; > + > +struct twlcore { > + bool ready; /* The core driver is ready to be used */ > + u32 twl_idcode; /* TWL IDCODE Register value */ > + unsigned int twl_id; > + > + struct twl_mapping *twl_map; > + struct twl_client *twl_modules; > +}; > + > +#endif
diff --git a/drivers/mfd/twl-core.c b/drivers/mfd/twl-core.c index e16084e..409b836 100644 --- a/drivers/mfd/twl-core.c +++ b/drivers/mfd/twl-core.c @@ -48,6 +48,7 @@ #include <linux/i2c.h> #include <linux/i2c/twl.h> +#include <linux/mfd/twl-core.h> /* Register descriptions for audio */ #include <linux/mfd/twl4030-audio.h> @@ -154,28 +155,7 @@ int twl4030_init_irq(struct device *dev, int irq_num); int twl4030_exit_irq(void); int twl4030_init_chip_irq(const char *chip); -/* Structure for each TWL4030/TWL6030 Slave */ -struct twl_client { - struct i2c_client *client; - struct regmap *regmap; -}; - -/* mapping the module id to slave id and base address */ -struct twl_mapping { - unsigned char sid; /* Slave ID */ - unsigned char base; /* base address */ -}; - -struct twl_private { - bool ready; /* The core driver is ready to be used */ - u32 twl_idcode; /* TWL IDCODE Register value */ - unsigned int twl_id; - - struct twl_mapping *twl_map; - struct twl_client *twl_modules; -}; - -static struct twl_private *twl_priv; +static struct twlcore *twl_priv; static struct twl_mapping twl4030_map[] = { /* @@ -745,7 +725,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) goto free; } - twl_priv = devm_kzalloc(&client->dev, sizeof(struct twl_private), + twl_priv = devm_kzalloc(&client->dev, sizeof(struct twlcore), GFP_KERNEL); if (!twl_priv) { status = -ENOMEM; @@ -803,6 +783,7 @@ twl_probe(struct i2c_client *client, const struct i2c_device_id *id) } twl_priv->ready = true; + dev_set_drvdata(&client->dev, twl_priv); /* setup clock framework */ clocks_init(&pdev->dev); diff --git a/include/linux/mfd/twl-core.h b/include/linux/mfd/twl-core.h new file mode 100644 index 0000000..d1c01b3 --- /dev/null +++ b/include/linux/mfd/twl-core.h @@ -0,0 +1,35 @@ +/* + * MFD core driver for the Texas Instruments TWL PMIC family + * + * Copyright (C) 2016 Nicolae Rosia <nicolae.rosia@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#ifndef __TWL_CORE_H__ +#define __TWL_CORE_H__ + +/* Structure for each TWL4030/TWL6030 Slave */ +struct twl_client { + struct i2c_client *client; + struct regmap *regmap; +}; + +/* mapping the module id to slave id and base address */ +struct twl_mapping { + unsigned char sid; /* Slave ID */ + unsigned char base; /* base address */ +}; + +struct twlcore { + bool ready; /* The core driver is ready to be used */ + u32 twl_idcode; /* TWL IDCODE Register value */ + unsigned int twl_id; + + struct twl_mapping *twl_map; + struct twl_client *twl_modules; +}; + +#endif
We want to get rid of exported symbols and have the child devices use structure members directly. Move the structure definitions to header and set drvdata so child devices can access it. Signed-off-by: Nicolae Rosia <Nicolae_Rosia@mentor.com> --- drivers/mfd/twl-core.c | 27 ++++----------------------- include/linux/mfd/twl-core.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 23 deletions(-) create mode 100644 include/linux/mfd/twl-core.h