Skip to content

Compile fixes for xcomm_zynq #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 18, 2016
Merged

Compile fixes for xcomm_zynq #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77169ae
drivers/iio: fix iio_triggered_buffer_setup API error
Mar 17, 2016
0b505cb
drivers/iio: fix st_pressure_buffer
Mar 17, 2016
11eceb4
drm: fix drm_edid.h on x86
Mar 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/iio/accel/st_accel_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = {
int st_accel_allocate_ring(struct iio_dev *indio_dev)
{
return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
&st_sensors_trigger_handler);
&st_sensors_trigger_handler, &st_accel_buffer_setup_ops);
}

void st_accel_deallocate_ring(struct iio_dev *indio_dev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/adc/ad7923.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ static int ad7923_probe(struct spi_device *spi)
return ret;

ret = iio_triggered_buffer_setup(indio_dev, NULL,
&ad7923_trigger_handler);
&ad7923_trigger_handler, NULL);
if (ret)
goto error_disable_reg;

Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/gyro/itg3200_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static irqreturn_t itg3200_trigger_handler(int irq, void *p)
int itg3200_buffer_configure(struct iio_dev *indio_dev)
{
return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
itg3200_trigger_handler);
itg3200_trigger_handler, NULL);
}

void itg3200_buffer_unconfigure(struct iio_dev *indio_dev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/gyro/st_gyro_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = {
int st_gyro_allocate_ring(struct iio_dev *indio_dev)
{
return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
&st_sensors_trigger_handler);
&st_sensors_trigger_handler, &st_gyro_buffer_setup_ops);
}

void st_gyro_deallocate_ring(struct iio_dev *indio_dev)
Expand Down
3 changes: 2 additions & 1 deletion drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,8 @@ static int inv_mpu_probe(struct i2c_client *client,

result = iio_triggered_buffer_setup(indio_dev,
inv_mpu6050_irq_handler,
inv_mpu6050_read_fifo
inv_mpu6050_read_fifo,
NULL
);
if (result) {
dev_err(&st->client->dev, "configure buffer fail %d\n",
Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/magnetometer/st_magn_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = {
int st_magn_allocate_ring(struct iio_dev *indio_dev)
{
return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
&st_sensors_trigger_handler);
&st_sensors_trigger_handler, &st_magn_buffer_setup_ops);
}

void st_magn_deallocate_ring(struct iio_dev *indio_dev)
Expand Down
2 changes: 1 addition & 1 deletion drivers/iio/pressure/st_pressure_buffer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static int st_press_buffer_predisable(struct iio_dev *indio_dev)

err = st_sensors_set_enable(indio_dev, false);

kfree(pdata->buffer_data);
kfree(press_data->buffer_data);
return err;
}

Expand Down
1 change: 1 addition & 0 deletions include/drm/drm_edid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#define __DRM_EDID_H__

#include <linux/types.h>
#include <drm/drm_crtc.h>

#define EDID_LENGTH 128
#define DDC_ADDR 0x50
Expand Down