Commit 89843828 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Miquel Raynal
Browse files

mtd_blkdevs: simplify blktrans_dev_get 



->private_data is set before the disk is added and never cleared, so don't
bother trying to handle a NULL pointer there.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMiquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20210823073359.705281-6-hch@lst.de
parent a0faf5fd

drivers/mtd/mtd_blkdevs.c

+2 −15
Original line number Diff line number Diff line
@@ -39,16 +39,12 @@ static void blktrans_dev_release(struct kref *kref) 


static struct mtd_blktrans_dev *blktrans_dev_get(struct gendisk *disk)

{

	struct mtd_blktrans_dev *dev;

	struct mtd_blktrans_dev *dev = disk->private_data;



	mutex_lock(&blktrans_ref_mutex);

	dev = disk->private_data;



	if (!dev)

		goto unlock;

	kref_get(&dev->ref);

unlock:

	mutex_unlock(&blktrans_ref_mutex);



	return dev;

}
@@ -204,9 +200,6 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) 
	struct mtd_blktrans_dev *dev = blktrans_dev_get(bdev->bd_disk);

	int ret = 0;



	if (!dev)

		return -ERESTARTSYS; /* FIXME: busy loop! -arnd*/



	mutex_lock(&dev->lock);



	if (dev->open)
@@ -250,9 +243,6 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) 
{

	struct mtd_blktrans_dev *dev = blktrans_dev_get(disk);



	if (!dev)

		return;



	mutex_lock(&dev->lock);



	if (--dev->open)
@@ -276,9 +266,6 @@ static int blktrans_getgeo(struct block_device *bdev, struct hd_geometry *geo) 
	struct mtd_blktrans_dev *dev = blktrans_dev_get(bdev->bd_disk);

	int ret = -ENXIO;



	if (!dev)

		return ret;



	mutex_lock(&dev->lock);



	if (!dev->mtd)