You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'staging-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging and IIO updates from Greg KH: "Here is the "big" staging and IIO driver update for 4.15-rc1. Lots and lots of little changes, almost all minor code cleanups as the Outreachy application process happened during this development cycle. Also happened was a lot of IIO driver activity, and the typec USB code moving out of staging to drivers/usb (same commits are in the USB tree on a persistent branch to not cause merge issues.) Overall, it's a wash, I think we added a few hundred more lines than removed, but really only a few thousand were modified at all. All of these have been in linux-next for a while. There might be a merge issue with Al's vfs tree in the pi433 driver (take his changes, they are always better), and the media tree with some of the odd atomisp cleanups (take the media tree's version)" * tag 'staging-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (507 commits) staging: lustre: add SPDX identifiers to all lustre files staging: greybus: Remove redundant license text staging: greybus: add SPDX identifiers to all greybus driver files staging: ccree: simplify ioread/iowrite staging: ccree: simplify registers access staging: ccree: simplify error handling logic staging: ccree: remove dead code staging: ccree: handle limiting of DMA masks staging: ccree: copy IV to DMAable memory staging: fbtft: remove redundant initialization of buf staging: sm750fb: Fix parameter mistake in poke32 staging: wilc1000: Fix bssid buffer offset in Txq staging: fbtft: fb_ssd1331: fix mirrored display staging: android: Fix checkpatch.pl error staging: greybus: loopback: convert loopback to use generic async operations staging: greybus: operation: add private data with get/set accessors staging: greybus: loopback: Fix iteration count on async path staging: greybus: loopback: Hold per-connection mutex across operations staging: greybus/loopback: use ktime_get() for time intervals staging: fsl-dpaa2/eth: Extra headroom in RX buffers ...
This commit is contained in:
@@ -171,7 +171,6 @@ static int acpi_als_read_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info acpi_als_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = acpi_als_read_raw,
|
||||
};
|
||||
|
||||
|
||||
@@ -245,7 +245,6 @@ static const struct iio_info adjd_s311_info = {
|
||||
.read_raw = adjd_s311_read_raw,
|
||||
.write_raw = adjd_s311_write_raw,
|
||||
.update_scan_mode = adjd_s311_update_scan_mode,
|
||||
.driver_module = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int adjd_s311_probe(struct i2c_client *client,
|
||||
|
||||
@@ -168,7 +168,6 @@ static int al3320a_write_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info al3320a_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = al3320a_read_raw,
|
||||
.write_raw = al3320a_write_raw,
|
||||
.attrs = &al3320a_attribute_group,
|
||||
|
||||
@@ -337,12 +337,10 @@ static int apds9300_write_interrupt_config(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info apds9300_info_no_irq = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = apds9300_read_raw,
|
||||
};
|
||||
|
||||
static const struct iio_info apds9300_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = apds9300_read_raw,
|
||||
.read_event_value = apds9300_read_thresh,
|
||||
.write_event_value = apds9300_write_thresh,
|
||||
|
||||
@@ -744,7 +744,6 @@ static int apds9960_write_event_config(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info apds9960_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.attrs = &apds9960_attribute_group,
|
||||
.read_raw = apds9960_read_raw,
|
||||
.write_raw = apds9960_write_raw,
|
||||
|
||||
@@ -217,7 +217,6 @@ static const struct attribute_group bh1750_attribute_group = {
|
||||
};
|
||||
|
||||
static const struct iio_info bh1750_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.attrs = &bh1750_attribute_group,
|
||||
.read_raw = bh1750_read_raw,
|
||||
.write_raw = bh1750_write_raw,
|
||||
|
||||
@@ -128,7 +128,6 @@ static int bh1780_read_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info bh1780_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = bh1780_read_raw,
|
||||
.debugfs_reg_access = bh1780_debugfs_reg_access,
|
||||
};
|
||||
|
||||
@@ -292,7 +292,6 @@ static const struct attribute_group cm32181_attribute_group = {
|
||||
};
|
||||
|
||||
static const struct iio_info cm32181_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &cm32181_read_raw,
|
||||
.write_raw = &cm32181_write_raw,
|
||||
.attrs = &cm32181_attribute_group,
|
||||
|
||||
@@ -322,7 +322,6 @@ static const struct attribute_group cm3232_attribute_group = {
|
||||
};
|
||||
|
||||
static const struct iio_info cm3232_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &cm3232_read_raw,
|
||||
.write_raw = &cm3232_write_raw,
|
||||
.attrs = &cm3232_attribute_group,
|
||||
|
||||
@@ -211,7 +211,6 @@ static int cm3323_write_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info cm3323_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = cm3323_read_raw,
|
||||
.write_raw = cm3323_write_raw,
|
||||
.attrs = &cm3323_attribute_group,
|
||||
|
||||
@@ -126,7 +126,6 @@ static int cm3605_read_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info cm3605_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = cm3605_read_raw,
|
||||
};
|
||||
|
||||
|
||||
@@ -612,7 +612,6 @@ static const struct attribute_group cm36651_attribute_group = {
|
||||
};
|
||||
|
||||
static const struct iio_info cm36651_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &cm36651_read_raw,
|
||||
.write_raw = &cm36651_write_raw,
|
||||
.read_event_value = &cm36651_read_prox_thresh,
|
||||
|
||||
@@ -175,7 +175,6 @@ static int cros_ec_light_prox_write(struct iio_dev *indio_dev,
|
||||
static const struct iio_info cros_ec_light_prox_info = {
|
||||
.read_raw = &cros_ec_light_prox_read,
|
||||
.write_raw = &cros_ec_light_prox_write,
|
||||
.driver_module = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int cros_ec_light_prox_probe(struct platform_device *pdev)
|
||||
|
||||
@@ -1384,7 +1384,6 @@ static const struct iio_info gp2ap020a00f_info = {
|
||||
.read_event_config = &gp2ap020a00f_read_event_config,
|
||||
.write_event_value = &gp2ap020a00f_write_event_val,
|
||||
.write_event_config = &gp2ap020a00f_write_event_config,
|
||||
.driver_module = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int gp2ap020a00f_buffer_postenable(struct iio_dev *indio_dev)
|
||||
@@ -1481,7 +1480,6 @@ static const struct iio_buffer_setup_ops gp2ap020a00f_buffer_setup_ops = {
|
||||
};
|
||||
|
||||
static const struct iio_trigger_ops gp2ap020a00f_trigger_ops = {
|
||||
.owner = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int gp2ap020a00f_probe(struct i2c_client *client,
|
||||
|
||||
@@ -177,7 +177,6 @@ static int als_write_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info als_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &als_read_raw,
|
||||
.write_raw = &als_write_raw,
|
||||
};
|
||||
|
||||
@@ -156,7 +156,6 @@ static int prox_write_raw(struct iio_dev *indio_dev,
|
||||
}
|
||||
|
||||
static const struct iio_info prox_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &prox_read_raw,
|
||||
.write_raw = &prox_write_raw,
|
||||
};
|
||||
|
||||
@@ -624,14 +624,12 @@ static int isl29018_chip_init(struct isl29018_chip *chip)
|
||||
|
||||
static const struct iio_info isl29018_info = {
|
||||
.attrs = &isl29018_group,
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = isl29018_read_raw,
|
||||
.write_raw = isl29018_write_raw,
|
||||
};
|
||||
|
||||
static const struct iio_info isl29023_info = {
|
||||
.attrs = &isl29023_group,
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = isl29018_read_raw,
|
||||
.write_raw = isl29018_write_raw,
|
||||
};
|
||||
|
||||
@@ -536,7 +536,6 @@ static const struct iio_chan_spec isl29028_channels[] = {
|
||||
|
||||
static const struct iio_info isl29028_info = {
|
||||
.attrs = &isl29108_group,
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = isl29028_read_raw,
|
||||
.write_raw = isl29028_write_raw,
|
||||
};
|
||||
|
||||
@@ -214,7 +214,6 @@ static const struct iio_info isl29125_info = {
|
||||
.read_raw = isl29125_read_raw,
|
||||
.write_raw = isl29125_write_raw,
|
||||
.attrs = &isl29125_attribute_group,
|
||||
.driver_module = THIS_MODULE,
|
||||
};
|
||||
|
||||
static int isl29125_buffer_preenable(struct iio_dev *indio_dev)
|
||||
|
||||
@@ -271,7 +271,6 @@ static const struct iio_chan_spec jsa1212_channels[] = {
|
||||
};
|
||||
|
||||
static const struct iio_info jsa1212_info = {
|
||||
.driver_module = THIS_MODULE,
|
||||
.read_raw = &jsa1212_read_raw,
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user