Skip to content

Commit b707512

Browse files
torvaldstorvalds
committed
Merge tag 'staging-6.12-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 cleanups and removals for 6.12-rc1. Nothing exciting here, just slow, constant, forward progress in removing code and cleaning up some old drivers, along with removing one of them that was not being used anymore at all. In discussions with some developers this past week, even more deletions will be happening for the next major merge window, as we seems to have code here that obviously no one is using anymore. Along with the normal cleanups is the good vme_user code forward progress, the one major bright spot in the staging subsystem for code that people rely on, and is getting good development behind it. Hopefully it can graduate out of staging "soon". All of these changes have been in linux-next for a long time with no reported problems" * tag 'staging-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (141 commits) staging: vt6655: Rename variable apTD1Rings staging: vt6655: Rename variable apTD0Rings staging: rtl8723bs: remove unused 'poll_cnt' from rtw_set_rpwm() staging: rtl8723bs: remove unused cnt from recv_func() staging: rtl8723bs: remove unused efuseValue from efuse_OneByteWrite() staging: rtl8712: remove unused drvinfo_sz from update_recvframe_attrib staging: vt6655: mac.h: Fix possible precedence issue in macros staging: rtl8723bs: include: Remove spaces before tabs in rtw_security.h staging: rtl8723bs: include: Fix trailing */ position in rtw_security.h staging: rtl8723bs: include: Fix indent for else block struct in rtw_security.h staging: rtl8723bs: include: Fix indent for struct _byte_ in rtw_security.h staging: rtl8723bs: include: Fix use of tabs for indent in rtw_security.h staging: rtl8723bs: include: Fix indent for switch block in rtw_security.h staging: rtl8723bs: include: Fix indent for switch case in rtw_security.h staging: rtl8723bs: include: Fix open brace position in rtw_security.h staging: nvec: Use IRQF_NO_AUTOEN flag in request_irq() staging: rtl8723bs: Remove unused file rtw_rf.c staging: rtl8723bs: Remove unused function rtw_ch2freq staging: rtl8723bs: Remove unused files rtw_debug.c and rtw_debug.h staging: rtl8723bs: Remove unused function dump_4_regs ...
2 parents 356a031 + b4fdf9b commit b707512

File tree

128 files changed

+827
-8531
lines changed

Some content is hidden

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

128 files changed

+827
-8531
lines changed

‎drivers/staging/Kconfig

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@ source "drivers/staging/fbtft/Kconfig"
5454

5555
source "drivers/staging/most/Kconfig"
5656

57-
source "drivers/staging/ks7010/Kconfig"
58-
5957
source "drivers/staging/greybus/Kconfig"
6058

6159
source "drivers/staging/vc04_services/Kconfig"

‎drivers/staging/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ obj-$(CONFIG_MFD_NVEC) += nvec/
1717
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
1818
obj-$(CONFIG_FB_TFT) += fbtft/
1919
obj-$(CONFIG_MOST) += most/
20-
obj-$(CONFIG_KS7010) += ks7010/
2120
obj-$(CONFIG_GREYBUS) += greybus/
2221
obj-$(CONFIG_BCM2835_VCHIQ) += vc04_services/
2322
obj-$(CONFIG_XIL_AXIS_FIFO) += axis-fifo/

‎drivers/staging/fbtft/fb_ili9320.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ static int init_display(struct fbtft_par *par)
3535
par->fbtftops.reset(par);
3636

3737
devcode = read_devicecode(par);
38-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "Device code: 0x%04X\n",
39-
devcode);
4038
if ((devcode != 0x0000) && (devcode != 0x9320))
4139
dev_warn(par->info->device,
4240
"Unrecognized Device code: 0x%04X (expected 0x9320)\n",

‎drivers/staging/fbtft/fb_ra8875.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ static int init_display(struct fbtft_par *par)
4141
{
4242
gpiod_set_value(par->gpio.dc, 1);
4343

44-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
45-
"%s()\n", __func__);
46-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
47-
"display size %dx%d\n",
48-
par->info->var.xres,
49-
par->info->var.yres);
50-
5144
par->fbtftops.reset(par);
5245

5346
if ((par->info->var.xres == 320) && (par->info->var.yres == 240)) {

‎drivers/staging/fbtft/fb_sh1106.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,6 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
8888

8989
static int blank(struct fbtft_par *par, bool on)
9090
{
91-
fbtft_par_dbg(DEBUG_BLANK, par, "(%s=%s)\n",
92-
__func__, on ? "true" : "false");
93-
9491
write_reg(par, on ? 0xAE : 0xAF);
9592

9693
return 0;

‎drivers/staging/fbtft/fb_ssd1289.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,6 @@ static int set_var(struct fbtft_par *par)
9393
{
9494
if (par->fbtftops.init_display != init_display) {
9595
/* don't risk messing up register 11h */
96-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
97-
"%s: skipping since custom init_display() is used\n",
98-
__func__);
9996
return 0;
10097
}
10198

‎drivers/staging/fbtft/fb_ssd1306.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,9 +148,6 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
148148

149149
static int blank(struct fbtft_par *par, bool on)
150150
{
151-
fbtft_par_dbg(DEBUG_BLANK, par, "(%s=%s)\n",
152-
__func__, on ? "true" : "false");
153-
154151
if (on)
155152
write_reg(par, 0xAE);
156153
else

‎drivers/staging/fbtft/fb_ssd1325.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ static uint8_t rgb565_to_g16(u16 pixel)
7272

7373
static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
7474
{
75-
fbtft_par_dbg(DEBUG_SET_ADDR_WIN, par,
76-
"%s(xs=%d, ys=%d, xe=%d, ye=%d)\n", __func__, xs, ys, xe,
77-
ye);
78-
7975
write_reg(par, 0x75);
8076
write_reg(par, 0x00);
8177
write_reg(par, 0x3f);
@@ -86,9 +82,6 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
8682

8783
static int blank(struct fbtft_par *par, bool on)
8884
{
89-
fbtft_par_dbg(DEBUG_BLANK, par, "(%s=%s)\n",
90-
__func__, on ? "true" : "false");
91-
9285
if (on)
9386
write_reg(par, 0xAE);
9487
else
@@ -109,8 +102,6 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
109102
{
110103
int i;
111104

112-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par, "%s()\n", __func__);
113-
114105
for (i = 0; i < GAMMA_LEN; i++) {
115106
if (i > 0 && curves[i] < 1) {
116107
dev_err(par->info->device,

‎drivers/staging/fbtft/fb_ssd1331.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,6 @@ static int set_gamma(struct fbtft_par *par, u32 *curves)
167167

168168
static int blank(struct fbtft_par *par, bool on)
169169
{
170-
fbtft_par_dbg(DEBUG_BLANK, par, "(%s=%s)\n",
171-
__func__, on ? "true" : "false");
172170
if (on)
173171
write_reg(par, 0xAE);
174172
else

‎drivers/staging/fbtft/fb_ssd1351.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ static int set_var(struct fbtft_par *par)
7272

7373
if (par->fbtftops.init_display != init_display) {
7474
/* don't risk messing up register A0h */
75-
fbtft_par_dbg(DEBUG_INIT_DISPLAY, par,
76-
"%s: skipping since custom init_display() is used\n",
77-
__func__);
7875
return 0;
7976
}
8077

@@ -213,7 +210,7 @@ static void register_onboard_backlight(struct fbtft_par *par)
213210
struct backlight_properties bl_props = { 0, };
214211

215212
bl_props.type = BACKLIGHT_RAW;
216-
bl_props.power = FB_BLANK_POWERDOWN;
213+
bl_props.power = BACKLIGHT_POWER_OFF;
217214

218215
bd = backlight_device_register(dev_driver_string(par->info->device),
219216
par->info->device, par, &bl_ops,

0 commit comments

Comments
 (0)