On 10/18/11 09:28, Ricardo Ribalda Delgado wrote:
> Architechtures based on device-tree does not have platform data
check your spelling.
> associated to the spi/i2c devices.
> This patch allows those architechtures to use the cma3000 driver with
> a default configuration.
>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
> ---
> drivers/input/misc/cma3000_d0x.c | 21 +++++++++++++++++++--
> 1 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/input/misc/cma3000_d0x.c b/drivers/input/misc/cma3000_d0x.c
> index 1633b63..2f993d5 100644
> --- a/drivers/input/misc/cma3000_d0x.c
> +++ b/drivers/input/misc/cma3000_d0x.c
> @@ -62,6 +62,18 @@
> #define BIT_TO_2G 18
> #define BIT_TO_8G 71
>
> +static struct cma3000_platform_data cma3000_default_pdata = {
> + .mdthr = 0x8,
> + .mdfftmr = 0x33,
> + .ffthr = 0x8,
> + .mode = CMAMODE_MEAS400,
> + .g_range = CMARANGE_2G,
> + .fuzz_x = BIT_TO_2G,
> + .fuzz_y = BIT_TO_2G,
> + .fuzz_z = BIT_TO_2G,
> + .irqflags = 0,
> +};
I'm not that familiar with DT yet, but surely there is a means to supplying
the equivalent data? I'd prefer to see that provided here as well.
> +
> struct cma3000_accl_data {
> const struct cma3000_bus_ops *bus_ops;
> const struct cma3000_platform_data *pdata;
> @@ -283,19 +295,24 @@ EXPORT_SYMBOL(cma3000_resume);
> struct cma3000_accl_data *cma3000_init(struct device *dev, int irq,
> const struct cma3000_bus_ops *bops)
> {
> - const struct cma3000_platform_data *pdata = dev->platform_data;
> + const struct cma3000_platform_data *pdata;
Leave this line alone....
> struct cma3000_accl_data *data;
> struct input_dev *input_dev;
> int rev;
> int error;
>
> + if (!dev->platform_data) {
> + dev_info(dev, "platform data not found, using default\n");
> + pdata = &cma3000_default_pdata;
> + } else
> + pdata = dev->platform_data;
> +
and this becomes
if (pdata == NULL) {
dev_info(dev, "platform data not found, using default\n");
pdata = &cma3000_default_pdata;
}
> if (!pdata) {
> dev_err(dev, "platform data not found\n");
> error = -EINVAL;
> goto err_out;
> }
This can't happen now so get rid of the test.
>
> -
> /* if no IRQ return error */
> if (irq == 0) {
> error = -EINVAL;
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
