Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a11a789 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jens Axboe
Browse files

mg_disk: fix dependency on libata 



Add local copies of ata_id_string() and ata_id_c_string() to mg_disk
so there is no need for the driver to depend on ATA and SCSI.

[ Impact: break dependency on libata by copying ata id string functions ]

Cc: unsik Kim <donari75@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent a03bb5a3

drivers/block/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -412,7 +412,7 @@ config ATA_OVER_ETH 




config MG_DISK

config MG_DISK

	tristate "mGine mflash, gflash support"

	tristate "mGine mflash, gflash support"

	depends on ARM && ATA && GPIOLIB

	depends on ARM && GPIOLIB

	help

	help

	  mGine mFlash(gFlash) block device driver

	  mGine mFlash(gFlash) block device driver

drivers/block/mg_disk.c

+40 −4
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <linux/fs.h>

#include <linux/fs.h>

#include <linux/blkdev.h>

#include <linux/blkdev.h>

#include <linux/hdreg.h>

#include <linux/hdreg.h>

#include <linux/libata.h>

#include <linux/ata.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>
@@ -357,6 +357,42 @@ static irqreturn_t mg_irq(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





/* local copy of ata_id_string() */

static void mg_id_string(const u16 *id, unsigned char *s,

			 unsigned int ofs, unsigned int len)

{

	unsigned int c;



	BUG_ON(len & 1);



	while (len > 0) {

		c = id[ofs] >> 8;

		*s = c;

		s++;



		c = id[ofs] & 0xff;

		*s = c;

		s++;



		ofs++;

		len -= 2;

	}

}



/* local copy of ata_id_c_string() */

static void mg_id_c_string(const u16 *id, unsigned char *s,

			   unsigned int ofs, unsigned int len)

{

	unsigned char *p;



	mg_id_string(id, s, ofs, len - 1);



	p = s + strnlen(s, len - 1);

	while (p > s && p[-1] == ' ')

		p--;

	*p = '\0';

}



static int mg_get_disk_id(struct mg_host *host)

static int mg_get_disk_id(struct mg_host *host)

{

{

	u32 i;

	u32 i;
@@ -403,9 +439,9 @@ static int mg_get_disk_id(struct mg_host *host) 
		host->n_sectors -= host->nres_sectors;

		host->n_sectors -= host->nres_sectors;

	}

	}





	ata_id_c_string(id, fwrev, ATA_ID_FW_REV, sizeof(fwrev));

	mg_id_c_string(id, fwrev, ATA_ID_FW_REV, sizeof(fwrev));

	ata_id_c_string(id, model, ATA_ID_PROD, sizeof(model));

	mg_id_c_string(id, model, ATA_ID_PROD, sizeof(model));

	ata_id_c_string(id, serial, ATA_ID_SERNO, sizeof(serial));

	mg_id_c_string(id, serial, ATA_ID_SERNO, sizeof(serial));

	printk(KERN_INFO "mg_disk: model: %s\n", model);

	printk(KERN_INFO "mg_disk: model: %s\n", model);

	printk(KERN_INFO "mg_disk: firm: %.8s\n", fwrev);

	printk(KERN_INFO "mg_disk: firm: %.8s\n", fwrev);

	printk(KERN_INFO "mg_disk: serial: %s\n", serial);

	printk(KERN_INFO "mg_disk: serial: %s\n", serial);