summaryrefslogtreecommitdiff
path: root/drivers/staging/greybus
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2023-09-01 19:27:29 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2023-09-01 19:27:29 +0300
commite925992671907314b7db6793a28eb39b36bc21a4 (patch)
tree85d1465ca929ec35ab73609a84a3b86a54e808b2 /drivers/staging/greybus
parent51e7accbe8ab51476fbe55fbb5616c12fb3a0beb (diff)
parentaee17df05ea3771cb74662430dc98e69b72ab9f3 (diff)
downloadlinux-e925992671907314b7db6793a28eb39b36bc21a4.tar.xz
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 ...
Diffstat (limited to 'drivers/staging/greybus')
-rw-r--r--drivers/staging/greybus/arche-platform.c1
-rw-r--r--drivers/staging/greybus/fw-core.c4
-rw-r--r--drivers/staging/greybus/pwm.c1
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/greybus/arche-platform.c b/drivers/staging/greybus/arche-platform.c
index ebe835f25d13..891b75327d7f 100644
--- a/drivers/staging/greybus/arche-platform.c
+++ b/drivers/staging/greybus/arche-platform.c
@@ -20,6 +20,7 @@
#include <linux/suspend.h>
#include <linux/time.h>
#include <linux/greybus.h>
+#include <linux/of.h>
#include "arche_platform.h"
#if IS_ENABLED(CONFIG_USB_HSIC_USB3613)
diff --git a/drivers/staging/greybus/fw-core.c b/drivers/staging/greybus/fw-core.c
index 57bebf24636b..0fb15a60412f 100644
--- a/drivers/staging/greybus/fw-core.c
+++ b/drivers/staging/greybus/fw-core.c
@@ -89,7 +89,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
}
connection = gb_connection_create(bundle, cport_id,
- gb_fw_mgmt_request_handler);
+ gb_fw_mgmt_request_handler);
if (IS_ERR(connection)) {
ret = PTR_ERR(connection);
dev_err(&bundle->dev,
@@ -110,7 +110,7 @@ static int gb_fw_core_probe(struct gb_bundle *bundle,
}
connection = gb_connection_create(bundle, cport_id,
- gb_fw_download_request_handler);
+ gb_fw_download_request_handler);
if (IS_ERR(connection)) {
dev_err(&bundle->dev, "failed to create download connection (%ld)\n",
PTR_ERR(connection));
diff --git a/drivers/staging/greybus/pwm.c b/drivers/staging/greybus/pwm.c
index 88da1d796f13..f569d371a007 100644
--- a/drivers/staging/greybus/pwm.c
+++ b/drivers/staging/greybus/pwm.c
@@ -19,7 +19,6 @@ struct gb_pwm_chip {
u8 pwm_max; /* max pwm number */
struct pwm_chip chip;
- struct pwm_chip *pwm;
};
static inline struct gb_pwm_chip *pwm_chip_to_gb_pwm_chip(struct pwm_chip *chip)