Skip to content

Commit e925992

Browse files
torvaldstorvalds
committed
Merge tag 'staging-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here are a set of staging driver cleanups for 6.6-rc1. Nothing huge in here at all, overall we dropped a few hundred lines of code, it's been a quiet development cycle for this subsystem. Nothing stands out, everything can be categorized as "minor coding style cleanups for staging drivers" and there was one race condition fixed. Full details in the shortlog. All have been in linux-next for a while with no reported problems" * tag 'staging-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (71 commits) staging: rtl8192e: Annotate struct rtllib_txb with __counted_by staging: greybus: fix alignment of open parenthesis staging: sm750fb: fix sii164InitChip function name staging: vme_user: fix check lines should not end with a '(' staging: vme_user: fix check blank lines not necessary staging: rtl8723bs: Use helpers to check broadcast and multicast Ether addresses staging: vt6655: replace camel case by snake case staging: rtl8192e: Remove unsupported mode IW_MODE_MESH staging: rtl8192e: Remove unsupported mode IW_MODE_REPEAT staging: rtl8192e: Remove unused function rtllib_start_master_bss() staging: rtl8192e: Remove unsupported mode IW_MODE_MASTER staging: vt6655: Change camel case variables to snake case staging: fieldbus: arcx-anybus: Remove redundant of_match_ptr() staging: vme_user: fix alignment of open parenthesis Staging: rtl8192e: Rename function RxBaInactTimeout Staging: rtl8192e: Rename function TxBaInactTimeout Staging: rtl8192e: Rename function BaSetupTimeOut Staging: rtl8192e: Rename function TsInitDelBA Staging: rtl8192e: Rename function TsInitAddBA staging: vme_user: fix check alignment should match open parenthesis ...
2 parents 51e7acc + aee17df commit e925992

Some content is hidden

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

62 files changed

+487
-941
lines changed

‎drivers/staging/axis-fifo/axis-fifo.c

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717
#include <linux/kernel.h>
18+
#include <linux/of.h>
19+
#include <linux/platform_device.h>
1820
#include <linux/wait.h>
1921
#include <linux/mutex.h>
2022
#include <linux/device.h>
@@ -32,10 +34,6 @@
3234
#include <linux/jiffies.h>
3335
#include <linux/miscdevice.h>
3436

35-
#include <linux/of_address.h>
36-
#include <linux/of_device.h>
37-
#include <linux/of_platform.h>
38-
3937
/* ----------------------------
4038
* driver parameters
4139
* ----------------------------
@@ -839,16 +837,8 @@ static int axis_fifo_probe(struct platform_device *pdev)
839837
* ----------------------------
840838
*/
841839

842-
/* get iospace for the device */
843-
r_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
844-
if (!r_mem) {
845-
dev_err(fifo->dt_device, "invalid address\n");
846-
rc = -ENODEV;
847-
goto err_initial;
848-
}
849-
850-
/* request physical memory */
851-
fifo->base_addr = devm_ioremap_resource(fifo->dt_device, r_mem);
840+
/* get iospace for the device and request physical memory */
841+
fifo->base_addr = devm_platform_get_and_ioremap_resource(pdev, 0, &r_mem);
852842
if (IS_ERR(fifo->base_addr)) {
853843
rc = PTR_ERR(fifo->base_addr);
854844
goto err_initial;

‎drivers/staging/fieldbus/anybuss/arcx-anybus.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ create_anybus_host(struct platform_device *pdev, int idx)
156156
if (IS_ERR(ops.regmap))
157157
return ERR_CAST(ops.regmap);
158158
ops.irq = platform_get_irq(pdev, idx);
159-
if (ops.irq <= 0)
160-
return ERR_PTR(-EINVAL);
159+
if (ops.irq < 0)
160+
return ERR_PTR(ops.irq);
161161
return devm_anybuss_host_common_probe(&pdev->dev, &ops);
162162
}
163163

@@ -343,7 +343,7 @@ static struct platform_driver controller_driver = {
343343
.remove_new = controller_remove,
344344
.driver = {
345345
.name = "arcx-anybus-controller",
346-
.of_match_table = of_match_ptr(controller_of_match),
346+
.of_match_table = controller_of_match,
347347
},
348348
};
349349

‎drivers/staging/greybus/arche-platform.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include <linux/suspend.h>
2121
#include <linux/time.h>
2222
#include <linux/greybus.h>
23+
#include <linux/of.h>
2324
#include "arche_platform.h"
2425

2526
#if IS_ENABLED(CONFIG_USB_HSIC_USB3613)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
8989
}
9090

9191
connection = gb_connection_create(bundle, cport_id,
92-
gb_fw_mgmt_request_handler);
92+
gb_fw_mgmt_request_handler);
9393
if (IS_ERR(connection)) {
9494
ret = PTR_ERR(connection);
9595
dev_err(&bundle->dev,
@@ -110,7 +110,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
110110
}
111111

112112
connection = gb_connection_create(bundle, cport_id,
113-
gb_fw_download_request_handler);
113+
gb_fw_download_request_handler);
114114
if (IS_ERR(connection)) {
115115
dev_err(&bundle->dev, "failed to create download connection (%ld)\n",
116116
PTR_ERR(connection));

‎drivers/staging/greybus/pwm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ struct gb_pwm_chip {
1919
u8 pwm_max; /* max pwm number */
2020

2121
struct pwm_chip chip;
22-
struct pwm_chip *pwm;
2322
};
2423

2524
static inline struct gb_pwm_chip *pwm_chip_to_gb_pwm_chip(struct pwm_chip *chip)

‎drivers/staging/media/imx/imx-media-capture.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/delay.h>
88
#include <linux/fs.h>
99
#include <linux/module.h>
10-
#include <linux/of_platform.h>
1110
#include <linux/pinctrl/consumer.h>
1211
#include <linux/platform_device.h>
1312
#include <linux/sched.h>

‎drivers/staging/media/imx/imx-media-dev-common.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
* Copyright (c) 2016 Mentor Graphics Inc.
77
*/
88

9-
#include <linux/of_graph.h>
10-
#include <linux/of_platform.h>
119
#include <media/v4l2-ctrls.h>
1210
#include <media/v4l2-event.h>
1311
#include <media/v4l2-ioctl.h>

‎drivers/staging/media/imx/imx8mq-mipi-csi2.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include <linux/module.h>
1818
#include <linux/mutex.h>
1919
#include <linux/of.h>
20-
#include <linux/of_device.h>
2120
#include <linux/platform_device.h>
2221
#include <linux/pm_runtime.h>
2322
#include <linux/regmap.h>

‎drivers/staging/media/meson/vdec/esparser.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <linux/ioctl.h>
1212
#include <linux/list.h>
1313
#include <linux/module.h>
14-
#include <linux/of_device.h>
1514
#include <linux/reset.h>
1615
#include <linux/interrupt.h>
1716
#include <media/videobuf2-dma-contig.h>

‎drivers/staging/media/meson/vdec/vdec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Author: Maxime Jourdan <[email protected]>
55
*/
66

7-
#include <linux/of_device.h>
7+
#include <linux/of.h>
88
#include <linux/clk.h>
99
#include <linux/io.h>
1010
#include <linux/module.h>

0 commit comments

Comments
 (0)