thunderbold: A few cleanups
Subsystems (6)
cover thunderbold: A few cleanups
Hello,
I'm currently working on a project that includes looking at all device ID structures from <linux/mod_devicetable.h>. While doing that for tb_service_id, I spotted these patch opportunities.
These are all non-critical and also my quest doesn't depend on this, so there is no urge to apply these patches. My suggestion is to apply them via the thunderbold tree during the next merge window with an ack from the network guys.
The first patch touches drivers/net and drivers/thunderbold. It could theretically be split, but then this results in at least 3 commits which seems excessive to handle three drivers, so I kept it as a single patch.
The third patch is a style change and so is subjective. Drop it, if you don't like it. Here splitting would be easy, but given that patch #1 already touches the same files, letting these go in together without splitting seems to be sensible.
Best regards
Uwe
Uwe Kleine-König (The Capable Hub) (3):
thunderbold: Stop passing matched device ID to .probe()
thunderbold: Assert that a service driver has a probe callback
thunderbold: Drop comma after device id array terminator
drivers/net/thunderbolt/main.c | 4 ++-- drivers/thunderbolt/dma_test.c | 4 ++-- drivers/thunderbolt/domain.c | 4 +--- drivers/thunderbolt/stream.c | 4 ++-- drivers/thunderbolt/xdomain.c | 3 +++ include/linux/thunderbolt.h | 2 +- 6 files changed, 11 insertions(+), 10 deletions(-)
base-commit: 4fa3f5fabb30bf00d7475d5a33459ea83d639bf9
Signature · 1 line
2.47.3
PATCH 1/3 thunderbold: Stop passing matched device ID to .probe()
No driver makes use of that parameter, so drop it and don't spend the effort to determine the matching entry.
--- drivers/net/thunderbolt/main.c | 2 +- drivers/thunderbolt/dma_test.c | 2 +- drivers/thunderbolt/domain.c | 4 +--- drivers/thunderbolt/stream.c | 2 +- include/linux/thunderbolt.h | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-)
drivers/net/thunderbolt/main.c +1 -1
@@ -1335,7 +1335,7 @@ static void tbnet_generate_mac(struct net_device *dev) dev->priv_flags |=IFF_LIVE_ADDR_CHANGE ; } -static int tbnet_probe (struct tb_service *svc,const struct tb_service_id *id) +static int tbnet_probe (struct tb_service *svc) {struct tb_xdomain *xd =tb_service_parent (svc);struct net_device *dev;
drivers/thunderbolt/dma_test.c +1 -1
@@ -636,7 +636,7 @@ static void dma_test_debugfs_init(struct tb_service *svc)debugfs_create_file ("test" ,0200 , debugfs_dir, svc, &test_fops); } -static int dma_test_probe (struct tb_service *svc,const struct tb_service_id *id) +static int dma_test_probe (struct tb_service *svc) {struct tb_xdomain *xd =tb_service_parent (svc);struct dma_test *dt;
drivers/thunderbolt/domain.c +1 -3
@@ -77,12 +77,10 @@ static int tb_service_probe(struct device *dev) {struct tb_service *svc =tb_to_service (dev);struct tb_service_driver *driver; -const struct tb_service_id *id; driver = container_of(dev->driver, struct tb_service_driver, driver); - id =__tb_service_match (dev, &driver->driver); -return driver->probe (svc, id); +return driver->probe (svc); }static void tb_service_remove (struct device *dev)
drivers/thunderbolt/stream.c +1 -1
@@ -1540,7 +1540,7 @@ static void tbstream_group_detach_stream(struct tbstream *stream)config_group_put (&sg->group); } -static int tbstream_probe (struct tb_service *svc,const struct tb_service_id *id) +static int tbstream_probe (struct tb_service *svc) {struct tbstream *stream;
include/linux/thunderbolt.h +1 -1
@@ -465,7 +465,7 @@ static inline struct tb_service *tb_to_service(struct device *dev)*/ struct tb_service_driver {struct device_driver driver; -int (*probe)(struct tb_service *svc,const struct tb_service_id *id); +int (*probe)(struct tb_service *svc);void (*remove)(struct tb_service *svc);void (*shutdown)(struct tb_service *svc);const struct tb_service_id *id_table;
Signature · 1 line
2.47.3
PATCH 2/3 thunderbold: Assert that a service driver has a probe callback
In reply to Uwe Kleine-König (The Capable Hub)tb_service_probe() calls the driver's probe function unconditionally. Check at driver register time that this callback is valid to prevent a NULL pointer exception.
--- drivers/thunderbolt/xdomain.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/thunderbolt/xdomain.c +3 -0
@@ -968,6 +968,9 @@ tb_xdp_schedule_request(struct tb *tb, const struct tb_xdp_header *hdr,*/ int tb_register_service_driver (struct tb_service_driver *drv) { +if (!drv->probe) +return -EINVAL ; + drv->driver.bus = &tb_bus_type;return driver_register (&drv->driver); }
Signature · 1 line
2.47.3
PATCH 3/3 thunderbold: Drop comma after device id array terminator
In reply to Uwe Kleine-König (The Capable Hub)The usual style for other device id arrays doesn't have a comma after the initializer.
--- drivers/net/thunderbolt/main.c | 2 +- drivers/thunderbolt/dma_test.c | 2 +- drivers/thunderbolt/stream.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/net/thunderbolt/main.c +1 -1
@@ -1455,7 +1455,7 @@ static DEFINE_SIMPLE_DEV_PM_OPS(tbnet_pm_ops, tbnet_suspend, tbnet_resume);static const struct tb_service_id tbnet_ids[] = { {TB_SERVICE ("network" ,1 ) }, - { }, + { } };MODULE_DEVICE_TABLE (tbsvc, tbnet_ids);
drivers/thunderbolt/dma_test.c +1 -1
@@ -689,7 +689,7 @@ static const struct dev_pm_ops dma_test_pm_ops = {static const struct tb_service_id dma_test_ids[] = { {TB_SERVICE ("dma_test" ,1 ) }, - { }, + { } };MODULE_DEVICE_TABLE (tbsvc, dma_test_ids);
drivers/thunderbolt/stream.c +1 -1
@@ -1630,7 +1630,7 @@ static const struct dev_pm_ops tbstream_pm_ops = {static const struct tb_service_id tbstream_ids[] = { {TB_SERVICE ("stream" ,1 ) }, - { }, + { } };MODULE_DEVICE_TABLE (tbsvc, tbstream_ids);
Signature · 1 line
2.47.3
Hi,
Quoted 20 lines · Uwe Kleine-König (The Capable Hub)
Hello,
I'm currently working on a project that includes looking at all device ID structures from <
linux/mod_devicetable.h>. While doing that fortb_service_id, I spotted these patch opportunities.These are all non-critical and also my quest doesn't depend on this, so there is no urge to apply these patches. My suggestion is to apply them via the thunderbold tree during the next merge window with an ack from the network guys.
The first patch touches
drivers/netanddrivers/thunderbold. It could theretically be split, but then this results in at least 3 commits which seems excessive to handle three drivers, so I kept it as a single patch.The third patch is a style change and so is subjective. Drop it, if you don't like it. Here splitting would be easy, but given that patch #1 already touches the same files, letting these go in together without splitting seems to be sensible.
Quoted 7 lines
Best regards
UweUwe Kleine-König (The Capable Hub) (3):
thunderbold: Stop passing matched device ID to .probe()
thunderbold: Assert that a service driver has a probe callback
thunderbold: Drop comma after device id array terminator
Fixed the typo "thunderbold" -> "thunderbolt" and applied all to thunderbolt.git/next. I also took the networking patch, let me know if that's not okay (I'm the maintainer of that driver too and it looked fine).
Thanks!
Hello Mika,
Quoted 7 lines · Mika Westerberg
Quoted 4 lines · Uwe Kleine-König (The Capable Hub)
Uwe Kleine-König (The Capable Hub) (3):
thunderbold: Stop passing matched device ID to .probe()
thunderbold: Assert that a service driver has a probe callback
thunderbold: Drop comma after device id array terminatorFixed the typo "thunderbold" -> "thunderbolt" and applied all to
Oh.
Quoted 2 lines
thunderbolt.git/next. I also took the networking patch, let me know if that's not okay (I'm the maintainer of that driver too and it looked fine).
Sounds fine to me. So assuming you're not offending the network guys, that should be ok.
Thanks!
Uwe