Commit a6b3a93e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe

sysace: HDIO_GETGEO has it's own method for ages

The way this driver tries to implement HDIO_GETGEO it'll never be called.
Then again on ppc it probably will never be called anyway because it's
utterly pointless.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 2e4934aa
...@@ -902,26 +902,17 @@ static int ace_release(struct inode *inode, struct file *filp) ...@@ -902,26 +902,17 @@ static int ace_release(struct inode *inode, struct file *filp)
return 0; return 0;
} }
static int ace_ioctl(struct inode *inode, struct file *filp, static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
unsigned int cmd, unsigned long arg)
{ {
struct ace_device *ace = inode->i_bdev->bd_disk->private_data; struct ace_device *ace = bdev->bd_disk->private_data;
struct hd_geometry __user *geo = (struct hd_geometry __user *)arg;
struct hd_geometry g;
dev_dbg(ace->dev, "ace_ioctl()\n");
switch (cmd) {
case HDIO_GETGEO:
g.heads = ace->cf_id.heads;
g.sectors = ace->cf_id.sectors;
g.cylinders = ace->cf_id.cyls;
g.start = 0;
return copy_to_user(geo, &g, sizeof(g)) ? -EFAULT : 0;
default: dev_dbg(ace->dev, "ace_getgeo()\n");
return -ENOTTY;
} geo->heads = ace->cf_id.heads;
return -ENOTTY; geo->sectors = ace->cf_id.sectors;
geo->cylinders = ace->cf_id.cyls;
return 0;
} }
static struct block_device_operations ace_fops = { static struct block_device_operations ace_fops = {
...@@ -930,7 +921,7 @@ static struct block_device_operations ace_fops = { ...@@ -930,7 +921,7 @@ static struct block_device_operations ace_fops = {
.release = ace_release, .release = ace_release,
.media_changed = ace_media_changed, .media_changed = ace_media_changed,
.revalidate_disk = ace_revalidate_disk, .revalidate_disk = ace_revalidate_disk,
.ioctl = ace_ioctl, .getgeo = ace_getgeo,
}; };
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment