Skip to content

Commit 723c188

Browse files
torvaldstorvalds
committed
Merge tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the big set of staging driver patches for 6.0-rc1. Another round where we removed more lines of code than added, always a nice progression. Some of that came from the movement of the vme code back into staging, and removal of some other of the vme driver code as there are no known users and it is very obsolete and unmaintained. It can be added back easily if someone offers to maintain it. Other than that this merge has lots of little things: - huge cleanups for r8188eu driver - minor cleanups for other wifi drivers - tiny loop fixes for greybus code - other small coding style fixes All of these have been in linux-next for a while with no reported issues" * tag 'staging-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (191 commits) staging: r8188eu: fix potential uninitialised variable use in rtw_pwrctrl.c staging: r8188eu: remove initializer from ret in rtw_pwr_wakeup staging: vt6655: Convert macro vt6655_mac_clear_stck_ds to function staging: vt6655: Rename MACvClearStckDS staging: fbtft: core: set smem_len before fb_deferred_io_init call staging: r8188eu: convert rtw_pwr_wakeup to correct error code semantics staging: r8188eu: make dump_chip_info() static staging: r8188eu: remove DoReserved prototype staging: r8188eu: remove OnAtim prototype staging: r8188eu: remove SetHwReg8188EU() staging: r8188eu: make update_TSF() and correct_TSF() static staging: r8188eu: remove unused parameter from update_TSF() staging: r8188eu: remove unused parameter from correct_TSF() staging: r8188eu: remove HW_VAR_SET_OPMODE from SetHwReg8188EU() staging: pi433: remove duplicated comments staging: qlge: refine variable name staging: vt6655: Convert macro vt6655_mac_word_reg_bits_off to function staging: vt6655: Convert macro vt6655_mac_reg_bits_off to function staging: vt6655: Convert macro vt6655_mac_word_reg_bits_on to function staging: vt6655: Convert macro vt6655_mac_reg_bits_on to function ...
2 parents 78acd4c + 87f600a commit 723c188

115 files changed

Lines changed: 2047 additions & 4714 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Documentation/driver-api/vme.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ The function :c:func:`vme_bus_num` returns the bus ID of the provided bridge.
290290
VME API
291291
-------
292292

293-
.. kernel-doc:: include/linux/vme.h
293+
.. kernel-doc:: drivers/staging/vme_user/vme.h
294294
:internal:
295295

296-
.. kernel-doc:: drivers/vme/vme.c
296+
.. kernel-doc:: drivers/staging/vme_user/vme.c
297297
:export:

‎MAINTAINERS‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19261,6 +19261,7 @@ F: drivers/staging/olpc_dcon/
1926119261
STAGING - REALTEK RTL8188EU DRIVERS
1926219262
M: Larry Finger <Larry.Finger@lwfinger.net>
1926319263
M: Phillip Potter <phil@philpotter.co.uk>
19264+
R: Pavel Skripkin <paskripkin@gmail.com>
1926419265
S: Supported
1926519266
F: drivers/staging/r8188eu/
1926619267

@@ -21580,12 +21581,10 @@ M: Martyn Welch <martyn@welchs.me.uk>
2158021581
M: Manohar Vanga <manohar.vanga@gmail.com>
2158121582
M: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2158221583
L: linux-kernel@vger.kernel.org
21583-
S: Maintained
21584+
S: Odd fixes
2158421585
T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
2158521586
F: Documentation/driver-api/vme.rst
2158621587
F: drivers/staging/vme_user/
21587-
F: drivers/vme/
21588-
F: include/linux/vme*
2158921588

2159021589
VM SOCKETS (AF_VSOCK)
2159121590
M: Stefano Garzarella <sgarzare@redhat.com>

‎drivers/Kconfig‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@ source "drivers/iio/Kconfig"
183183

184184
source "drivers/ntb/Kconfig"
185185

186-
source "drivers/vme/Kconfig"
187-
188186
source "drivers/pwm/Kconfig"
189187

190188
source "drivers/irqchip/Kconfig"

‎drivers/Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,6 @@ obj-$(CONFIG_PM_DEVFREQ) += devfreq/
165165
obj-$(CONFIG_EXTCON) += extcon/
166166
obj-$(CONFIG_MEMORY) += memory/
167167
obj-$(CONFIG_IIO) += iio/
168-
obj-$(CONFIG_VME_BUS) += vme/
169168
obj-$(CONFIG_IPACK_BUS) += ipack/
170169
obj-$(CONFIG_NTB) += ntb/
171170
obj-$(CONFIG_POWERCAP) += powercap/

‎drivers/staging/fbtft/fb_ssd1351.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,7 @@ static int update_onboard_backlight(struct backlight_device *bd)
196196
"%s: power=%d, fb_blank=%d\n",
197197
__func__, bd->props.power, bd->props.fb_blank);
198198

199-
on = (bd->props.power == FB_BLANK_UNBLANK) &&
200-
(bd->props.fb_blank == FB_BLANK_UNBLANK);
199+
on = !backlight_is_blank(bd);
201200
/* Onboard backlight connected to GPIO0 on SSD1351, GPIO1 unused */
202201
write_reg(par, 0xB5, on ? 0x03 : 0x02);
203202

‎drivers/staging/fbtft/fbtft-core.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ static int fbtft_backlight_update_status(struct backlight_device *bd)
137137
"%s: polarity=%d, power=%d, fb_blank=%d\n",
138138
__func__, polarity, bd->props.power, bd->props.fb_blank);
139139

140-
if ((bd->props.power == FB_BLANK_UNBLANK) &&
141-
(bd->props.fb_blank == FB_BLANK_UNBLANK))
140+
if (!backlight_is_blank(bd))
142141
gpiod_set_value(par->gpio.led[0], polarity);
143142
else
144143
gpiod_set_value(par->gpio.led[0], !polarity);
@@ -655,7 +654,6 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
655654
fbdefio->delay = HZ / fps;
656655
fbdefio->sort_pagereflist = true;
657656
fbdefio->deferred_io = fbtft_deferred_io;
658-
fb_deferred_io_init(info);
659657

660658
snprintf(info->fix.id, sizeof(info->fix.id), "%s", dev->driver->name);
661659
info->fix.type = FB_TYPE_PACKED_PIXELS;
@@ -666,6 +664,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
666664
info->fix.line_length = width * bpp / 8;
667665
info->fix.accel = FB_ACCEL_NONE;
668666
info->fix.smem_len = vmem_size;
667+
fb_deferred_io_init(info);
669668

670669
info->var.rotate = pdata->rotate;
671670
info->var.xres = width;

‎drivers/staging/greybus/audio_helper.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ int gbaudio_dapm_free_controls(struct snd_soc_dapm_context *dapm,
115115
int num)
116116
{
117117
int i;
118-
struct snd_soc_dapm_widget *w, *next_w;
118+
struct snd_soc_dapm_widget *w, *tmp_w;
119119
#ifdef CONFIG_DEBUG_FS
120120
struct dentry *parent = dapm->debugfs_dapm;
121121
struct dentry *debugfs_w = NULL;
@@ -124,13 +124,13 @@ int gbaudio_dapm_free_controls(struct snd_soc_dapm_context *dapm,
124124
mutex_lock(&dapm->card->dapm_mutex);
125125
for (i = 0; i < num; i++) {
126126
/* below logic can be optimized to identify widget pointer */
127-
list_for_each_entry_safe(w, next_w, &dapm->card->widgets,
128-
list) {
129-
if (w->dapm != dapm)
130-
continue;
131-
if (!strcmp(w->name, widget->name))
127+
w = NULL;
128+
list_for_each_entry(tmp_w, &dapm->card->widgets, list) {
129+
if (tmp_w->dapm == dapm &&
130+
!strcmp(tmp_w->name, widget->name)) {
131+
w = tmp_w;
132132
break;
133-
w = NULL;
133+
}
134134
}
135135
if (!w) {
136136
dev_err(dapm->dev, "%s: widget not found\n",

‎drivers/staging/greybus/fw-management.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ static struct fw_mgmt *get_fw_mgmt(struct cdev *cdev)
102102
}
103103

104104
static int fw_mgmt_interface_fw_version_operation(struct fw_mgmt *fw_mgmt,
105-
struct fw_mgmt_ioc_get_intf_version *fw_info)
105+
struct fw_mgmt_ioc_get_intf_version *fw_info)
106106
{
107107
struct gb_connection *connection = fw_mgmt->connection;
108108
struct gb_fw_mgmt_interface_fw_version_response response;
@@ -240,7 +240,7 @@ static int fw_mgmt_interface_fw_loaded_operation(struct gb_operation *op)
240240
}
241241

242242
static int fw_mgmt_backend_fw_version_operation(struct fw_mgmt *fw_mgmt,
243-
struct fw_mgmt_ioc_get_backend_version *fw_info)
243+
struct fw_mgmt_ioc_get_backend_version *fw_info)
244244
{
245245
struct gb_connection *connection = fw_mgmt->connection;
246246
struct gb_fw_mgmt_backend_fw_version_request request;
@@ -473,7 +473,7 @@ static int fw_mgmt_ioctl(struct fw_mgmt *fw_mgmt, unsigned int cmd,
473473
return -EFAULT;
474474

475475
ret = fw_mgmt_backend_fw_update_operation(fw_mgmt,
476-
backend_update.firmware_tag);
476+
backend_update.firmware_tag);
477477
if (ret)
478478
return ret;
479479

‎drivers/staging/greybus/loopback.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -870,7 +870,7 @@ static int gb_loopback_fn(void *data)
870870
if (gb->send_count == gb->iteration_max) {
871871
mutex_unlock(&gb->mutex);
872872

873-
/* Wait for synchronous and asynchronus completion */
873+
/* Wait for synchronous and asynchronous completion */
874874
gb_loopback_async_wait_all(gb);
875875

876876
/* Mark complete unless user-space has poked us */

‎drivers/staging/octeon/ethernet-rx.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@ void cvm_oct_rx_initialize(void)
469469
if (!(pow_receive_groups & BIT(i)))
470470
continue;
471471

472-
netif_napi_add(dev_for_napi, &oct_rx_group[i].napi,
473-
cvm_oct_napi_poll, rx_napi_weight);
472+
netif_napi_add_weight(dev_for_napi, &oct_rx_group[i].napi,
473+
cvm_oct_napi_poll, rx_napi_weight);
474474
napi_enable(&oct_rx_group[i].napi);
475475

476476
oct_rx_group[i].irq = OCTEON_IRQ_WORKQ0 + i;

0 commit comments

Comments
 (0)