Commit a10183d7 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

scsi: simplify scsi_partsize 



Call scsi_bios_ptable from scsi_partsize instead of requiring boilerplate
code in the callers.  Also switch the calling convention to match that
of the ->bios_param instances calling this function, and use true/false
for the return value instead of the weird -1 convention.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 26ae3533

Documentation/scsi/scsi_mid_low_api.txt

+0 −21
Original line number Diff line number Diff line
@@ -299,7 +299,6 @@ Summary: 
   scsi_host_alloc - return a new scsi_host instance whose refcount==1

   scsi_host_get - increments Scsi_Host instance's refcount

   scsi_host_put - decrements Scsi_Host instance's refcount (free if 0)

   scsi_partsize - parse partition table into cylinders, heads + sectors

   scsi_register - create and register a scsi host adapter instance.

   scsi_remove_device - detach and remove a SCSI device

   scsi_remove_host - detach and remove all SCSI devices owned by host
@@ -472,26 +471,6 @@ void scsi_host_get(struct Scsi_Host *shost) 
void scsi_host_put(struct Scsi_Host *shost)





/**

 * scsi_partsize - parse partition table into cylinders, heads + sectors

 * @buf: pointer to partition table

 * @capacity: size of (total) disk in 512 byte sectors

 * @cyls: outputs number of cylinders calculated via this pointer

 * @hds: outputs number of heads calculated via this pointer

 * @secs: outputs number of sectors calculated via this pointer

 *

 *      Returns 0 on success, -1 on failure

 *

 *      Might block: no

 *

 *      Notes: Caller owns memory returned (free with kfree() )

 *

 *      Defined in: drivers/scsi/scsicam.c

 **/

int scsi_partsize(unsigned char *buf, unsigned long capacity,

                  unsigned int *cyls, unsigned int *hds, unsigned int *secs)





/**

 * scsi_register - create and register a scsi host adapter instance.

 * @sht:        pointer to scsi host template

drivers/scsi/aic7xxx/aic79xx_osm.c

+3 −10
Original line number Diff line number Diff line
@@ -723,24 +723,17 @@ static int 
ahd_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,

		    sector_t capacity, int geom[])

{

	uint8_t *bh;

	int	 heads;

	int	 sectors;

	int	 cylinders;

	int	 ret;

	int	 extended;

	struct	 ahd_softc *ahd;



	ahd = *((struct ahd_softc **)sdev->host->hostdata);



	bh = scsi_bios_ptable(bdev);

	if (bh) {

		ret = scsi_partsize(bh, capacity,

				    &geom[2], &geom[0], &geom[1]);

		kfree(bh);

		if (ret != -1)

			return (ret);

	}

	if (scsi_partsize(bdev, capacity, geom))

		return 0;



	heads = 64;

	sectors = 32;

	cylinders = aic_sector_div(capacity, heads, sectors);

drivers/scsi/aic7xxx/aic7xxx_osm.c

+3 −10
Original line number Diff line number Diff line
@@ -695,11 +695,9 @@ static int 
ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev,

		    sector_t capacity, int geom[])

{

	uint8_t *bh;

	int	 heads;

	int	 sectors;

	int	 cylinders;

	int	 ret;

	int	 extended;

	struct	 ahc_softc *ahc;

	u_int	 channel;
@@ -707,14 +705,9 @@ ahc_linux_biosparam(struct scsi_device *sdev, struct block_device *bdev, 
	ahc = *((struct ahc_softc **)sdev->host->hostdata);

	channel = sdev_channel(sdev);



	bh = scsi_bios_ptable(bdev);

	if (bh) {

		ret = scsi_partsize(bh, capacity,

				    &geom[2], &geom[0], &geom[1]);

		kfree(bh);

		if (ret != -1)

			return (ret);

	}

	if (scsi_partsize(bdev, capacity, geom))

		return 0;



	heads = 64;

	sectors = 32;

	cylinders = aic_sector_div(capacity, heads, sectors);

drivers/scsi/arcmsr/arcmsr_hba.c

+4 −9
Original line number Diff line number Diff line
@@ -353,16 +353,11 @@ static irqreturn_t arcmsr_do_interrupt(int irq, void *dev_id) 
static int arcmsr_bios_param(struct scsi_device *sdev,

		struct block_device *bdev, sector_t capacity, int *geom)

{

	int ret, heads, sectors, cylinders, total_capacity;

	unsigned char *buffer;/* return copy of block device's partition table */

	int heads, sectors, cylinders, total_capacity;



	if (scsi_partsize(bdev, capacity, geom))

		return 0;



	buffer = scsi_bios_ptable(bdev);

	if (buffer) {

		ret = scsi_partsize(buffer, capacity, &geom[2], &geom[0], &geom[1]);

		kfree(buffer);

		if (ret != -1)

			return ret;

	}

	total_capacity = capacity;

	heads = 64;

	sectors = 32;

drivers/scsi/megaraid.c

+2 −11
Original line number Diff line number Diff line
@@ -2795,11 +2795,9 @@ megaraid_biosparam(struct scsi_device *sdev, struct block_device *bdev, 
		    sector_t capacity, int geom[])

{

	adapter_t	*adapter;

	unsigned char	*bh;

	int	heads;

	int	sectors;

	int	cylinders;

	int	rval;



	/* Get pointer to host config structure */

	adapter = (adapter_t *)sdev->host->hostdata;
@@ -2826,15 +2824,8 @@ megaraid_biosparam(struct scsi_device *sdev, struct block_device *bdev, 
			geom[2] = cylinders;

	}

	else {

		bh = scsi_bios_ptable(bdev);



		if( bh ) {

			rval = scsi_partsize(bh, capacity,

					    &geom[2], &geom[0], &geom[1]);

			kfree(bh);

			if( rval != -1 )

				return rval;

		}

		if (scsi_partsize(bdev, capacity, geom))

			return 0;



		dev_info(&adapter->dev->dev,

			 "invalid partition on this disk on channel %d\n",

CRA Git | Maintained and supported by SUSTech CRA and CCSE