Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecbe18f2 authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

iio:hid_sensors move to info_mask_(shared_by_type/separate) 



The original info_mask is going away in favour of the broken out versions.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent fa357a6a

drivers/iio/accel/hid-sensor-accel-3d.c

+12 −12
Original line number Diff line number Diff line
@@ -60,28 +60,28 @@ static const struct iio_chan_spec accel_3d_channels[] = { 
		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_X,

	}, {

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_Y,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Y,

	}, {

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Z,

	}

};

drivers/iio/gyro/hid-sensor-gyro-3d.c

+12 −12
Original line number Diff line number Diff line
@@ -60,28 +60,28 @@ static const struct iio_chan_spec gyro_3d_channels[] = { 
		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_X,

	}, {

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Y,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Y,

	}, {

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Z,

	}

};

drivers/iio/light/hid-sensor-als.c

+4 −4
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ static const struct iio_chan_spec als_channels[] = { 
		.type = IIO_INTENSITY,

		.modified = 1,

		.channel2 = IIO_MOD_LIGHT_BOTH,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_ILLUM,

	}

};

drivers/iio/magnetometer/hid-sensor-magn-3d.c

+12 −12
Original line number Diff line number Diff line
@@ -60,28 +60,28 @@ static const struct iio_chan_spec magn_3d_channels[] = { 
		.type = IIO_MAGN,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_X,

	}, {

		.type = IIO_MAGN,

		.modified = 1,

		.channel2 = IIO_MOD_Y,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Y,

	}, {

		.type = IIO_MAGN,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.info_mask = IIO_CHAN_INFO_OFFSET_SHARED_BIT |

		IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_SAMP_FREQ_SHARED_BIT |

		IIO_CHAN_INFO_HYSTERESIS_SHARED_BIT,

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_OFFSET) |

		BIT(IIO_CHAN_INFO_SCALE) |

		BIT(IIO_CHAN_INFO_SAMP_FREQ) |

		BIT(IIO_CHAN_INFO_HYSTERESIS),

		.scan_index = CHANNEL_SCAN_INDEX_Z,

	}

};