Commit 1987c551 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Jens Axboe
Browse files

s390/dasd: let driver core manage the sysfs attributes 



Wire up device_driver->dev_groups, so that really_probe() creates the
sysfs attributes for us automatically.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarJan Hoeppner <hoeppner@linux.ibm.com>
Signed-off-by: default avatarStefan Haberland <sth@linux.ibm.com>
Link: https://lore.kernel.org/r/20210316094513.2601218-3-sth@linux.ibm.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 86f0a011

drivers/s390/block/dasd.c

+2 −15
Original line number Diff line number Diff line
@@ -3440,15 +3440,6 @@ static void dasd_generic_auto_online(void *data, async_cookie_t cookie) 
 */

int dasd_generic_probe(struct ccw_device *cdev)

{

	int ret;



	ret = dasd_add_sysfs_files(cdev);

	if (ret) {

		DBF_EVENT_DEVID(DBF_WARNING, cdev, "%s",

				"dasd_generic_probe: could not add "

				"sysfs entries");

		return ret;

	}

	cdev->handler = &dasd_int_handler;



	/*
@@ -3489,15 +3480,13 @@ void dasd_generic_remove(struct ccw_device *cdev) 
	struct dasd_block *block;



	device = dasd_device_from_cdev(cdev);

	if (IS_ERR(device)) {

		dasd_remove_sysfs_files(cdev);

	if (IS_ERR(device))

		return;

	}



	if (test_and_set_bit(DASD_FLAG_OFFLINE, &device->flags) &&

	    !test_bit(DASD_FLAG_SAFE_OFFLINE_RUNNING, &device->flags)) {

		/* Already doing offline processing */

		dasd_put_device(device);

		dasd_remove_sysfs_files(cdev);

		return;

	}

	/*
@@ -3516,8 +3505,6 @@ void dasd_generic_remove(struct ccw_device *cdev) 
	 */

	if (block)

		dasd_free_block(block);



	dasd_remove_sysfs_files(cdev);

}

EXPORT_SYMBOL_GPL(dasd_generic_remove);

drivers/s390/block/dasd_devmap.c

+2 −13
Original line number Diff line number Diff line
@@ -1772,12 +1772,13 @@ static const struct attribute_group ext_pool_attr_group = { 
	.attrs = ext_pool_attrs,

};



static const struct attribute_group *dasd_attr_groups[] = {

const struct attribute_group *dasd_dev_groups[] = {

	&dasd_attr_group,

	&capacity_attr_group,

	&ext_pool_attr_group,

	NULL,

};

EXPORT_SYMBOL_GPL(dasd_dev_groups);



/*

 * Return value of the specified feature.
@@ -1895,18 +1896,6 @@ void dasd_path_remove_kobjects(struct dasd_device *device) 
}

EXPORT_SYMBOL(dasd_path_remove_kobjects);



int dasd_add_sysfs_files(struct ccw_device *cdev)

{

	return sysfs_create_groups(&cdev->dev.kobj, dasd_attr_groups);

}



void

dasd_remove_sysfs_files(struct ccw_device *cdev)

{

	sysfs_remove_groups(&cdev->dev.kobj, dasd_attr_groups);

}





int

dasd_devmap_init(void)

{

drivers/s390/block/dasd_eckd.c

+1 −0
Original line number Diff line number Diff line
@@ -6630,6 +6630,7 @@ static struct ccw_driver dasd_eckd_driver = { 
	.driver = {

		.name	= "dasd-eckd",

		.owner	= THIS_MODULE,

		.dev_groups = dasd_dev_groups,

	},

	.ids	     = dasd_eckd_ids,

	.probe	     = dasd_eckd_probe,

drivers/s390/block/dasd_fba.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ static struct ccw_driver dasd_fba_driver = { 
	.driver = {

		.name	= "dasd-fba",

		.owner	= THIS_MODULE,

		.dev_groups = dasd_dev_groups,

	},

	.ids         = dasd_fba_ids,

	.probe       = dasd_generic_probe,

drivers/s390/block/dasd_int.h

+1 −2
Original line number Diff line number Diff line
@@ -854,8 +854,7 @@ void dasd_delete_device(struct dasd_device *); 
int dasd_get_feature(struct ccw_device *, int);

int dasd_set_feature(struct ccw_device *, int, int);



int dasd_add_sysfs_files(struct ccw_device *);

void dasd_remove_sysfs_files(struct ccw_device *);

extern const struct attribute_group *dasd_dev_groups[];

void dasd_path_create_kobj(struct dasd_device *, int);

void dasd_path_create_kobjects(struct dasd_device *);

void dasd_path_remove_kobjects(struct dasd_device *);