GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-28 17:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s390/qeth: clean up device_type management

Browse source 
qeth uses three device_type structs - a generic one, and one for each
sub-driver (which is used for fixed-layer devices only). Instead of
exporting these device_types back&forth between the driver's modules,
make all the logic self-contained within the sub-drivers.

On disc->setup() they either install their own device_type, or add the
sysfs attributes that are missing in the generic device_type. Later on
disc->remove() these attributes are removed again from any device that
has the generic device_type.

Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Julian Wiedmann 2021-07-20 08:38:49 +02:00 • committed by David S. Miller
parent a37cfa28eb
commit ae57ea7a19
4 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/s390/net/qeth_core.h
View file

@ -767,7 +767,6 @@ enum qeth_threads {
}; };
struct qeth_discipline { struct qeth_discipline {
const struct device_type *devtype;
int (*setup) (struct ccwgroup_device *); int (*setup) (struct ccwgroup_device *);
void (*remove) (struct ccwgroup_device *); void (*remove) (struct ccwgroup_device *);
int (*set_online)(struct qeth_card *card, bool carrier_ok); int (*set_online)(struct qeth_card *card, bool carrier_ok);
@ -1040,7 +1039,6 @@ extern const struct qeth_discipline qeth_l2_discipline;
extern const struct qeth_discipline qeth_l3_discipline; extern const struct qeth_discipline qeth_l3_discipline;
extern const struct ethtool_ops qeth_ethtool_ops; extern const struct ethtool_ops qeth_ethtool_ops;
extern const struct attribute_group *qeth_dev_groups[]; extern const struct attribute_group *qeth_dev_groups[];
extern const struct device_type qeth_generic_devtype;
const char *qeth_get_cardname_short(struct qeth_card *); const char *qeth_get_cardname_short(struct qeth_card *);
int qeth_resize_buffer_pool(struct qeth_card *card, unsigned int count); int qeth_resize_buffer_pool(struct qeth_card *card, unsigned int count);

4
drivers/s390/net/qeth_core_main.c
View file

@ -6286,10 +6286,9 @@ void qeth_remove_discipline(struct qeth_card *card)
card->discipline = NULL; card->discipline = NULL;
} }
const struct device_type qeth_generic_devtype = { static const struct device_type qeth_generic_devtype = {
.name = "qeth_generic", .name = "qeth_generic",
}; };
EXPORT_SYMBOL_GPL(qeth_generic_devtype);
#define DBF_NAME_LEN 20 #define DBF_NAME_LEN 20
@ -6474,7 +6473,6 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
if (rc) if (rc)
goto err_setup_disc; goto err_setup_disc;
gdev->dev.type = card->discipline->devtype;
break; break;
} }

8
drivers/s390/net/qeth_l2_main.c
View file

@ -2056,10 +2056,12 @@ static int qeth_l2_probe_device(struct ccwgroup_device *gdev)
qeth_l2_vnicc_set_defaults(card); qeth_l2_vnicc_set_defaults(card);
mutex_init(&card->sbp_lock); mutex_init(&card->sbp_lock);
if (gdev->dev.type == &qeth_generic_devtype) { if (gdev->dev.type) {
rc = device_add_groups(&gdev->dev, qeth_l2_attr_groups); rc = device_add_groups(&gdev->dev, qeth_l2_attr_groups);
if (rc) if (rc)
return rc; return rc;
} else {
gdev->dev.type = &qeth_l2_devtype;
} }
INIT_WORK(&card->rx_mode_work, qeth_l2_rx_mode_work); INIT_WORK(&card->rx_mode_work, qeth_l2_rx_mode_work);
@ -2070,8 +2072,9 @@ static void qeth_l2_remove_device(struct ccwgroup_device *gdev)
{ {
struct qeth_card *card = dev_get_drvdata(&gdev->dev); struct qeth_card *card = dev_get_drvdata(&gdev->dev);
if (gdev->dev.type == &qeth_generic_devtype) if (gdev->dev.type != &qeth_l2_devtype)
device_remove_groups(&gdev->dev, qeth_l2_attr_groups); device_remove_groups(&gdev->dev, qeth_l2_attr_groups);
qeth_set_allowed_threads(card, 0, 1); qeth_set_allowed_threads(card, 0, 1);
wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0); wait_event(card->wait_q, qeth_threads_running(card, 0xffffffff) == 0);
@ -2191,7 +2194,6 @@ static int qeth_l2_control_event(struct qeth_card *card,
} }
const struct qeth_discipline qeth_l2_discipline = { const struct qeth_discipline qeth_l2_discipline = {
.devtype = &qeth_l2_devtype,
.setup = qeth_l2_probe_device, .setup = qeth_l2_probe_device,
.remove = qeth_l2_remove_device, .remove = qeth_l2_remove_device,
.set_online = qeth_l2_set_online, .set_online = qeth_l2_set_online,

7
drivers/s390/net/qeth_l3_main.c
View file

@ -1939,12 +1939,14 @@ static int qeth_l3_probe_device(struct ccwgroup_device *gdev)
if (!card->cmd_wq) if (!card->cmd_wq)
return -ENOMEM; return -ENOMEM;
if (gdev->dev.type == &qeth_generic_devtype) { if (gdev->dev.type) {
rc = device_add_groups(&gdev->dev, qeth_l3_attr_groups); rc = device_add_groups(&gdev->dev, qeth_l3_attr_groups);
if (rc) { if (rc) {
destroy_workqueue(card->cmd_wq); destroy_workqueue(card->cmd_wq);
return rc; return rc;
} }
} else {
gdev->dev.type = &qeth_l3_devtype;
} }
INIT_WORK(&card->rx_mode_work, qeth_l3_rx_mode_work); INIT_WORK(&card->rx_mode_work, qeth_l3_rx_mode_work);
@ -1955,7 +1957,7 @@ static void qeth_l3_remove_device(struct ccwgroup_device *cgdev)
{ {
struct qeth_card *card = dev_get_drvdata(&cgdev->dev); struct qeth_card *card = dev_get_drvdata(&cgdev->dev);
if (cgdev->dev.type == &qeth_generic_devtype) if (cgdev->dev.type != &qeth_l3_devtype)
device_remove_groups(&cgdev->dev, qeth_l3_attr_groups); device_remove_groups(&cgdev->dev, qeth_l3_attr_groups);
qeth_set_allowed_threads(card, 0, 1); qeth_set_allowed_threads(card, 0, 1);
@ -2064,7 +2066,6 @@ static int qeth_l3_control_event(struct qeth_card *card,
} }
const struct qeth_discipline qeth_l3_discipline = { const struct qeth_discipline qeth_l3_discipline = {
.devtype = &qeth_l3_devtype,
.setup = qeth_l3_probe_device, .setup = qeth_l3_probe_device,
.remove = qeth_l3_remove_device, .remove = qeth_l3_remove_device,
.set_online = qeth_l3_set_online, .set_online = qeth_l3_set_online,