aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsas
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2011-01-23 09:34:25 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-01-24 13:05:45 -0500
commit1e34c8387380269b9d7707d625aeb9e9e92233f0 (patch)
treea64c493147a1e728474b15d2afbfc97b897800c4 /drivers/scsi/libsas
parent96db6fa992570bfa46da8428fa466ee6b18e39d6 (diff)
[SCSI] libsas: remove spurious sata control register read/write
Originally, libata required the illusion that it could access the sata control register. Now, however, it can run perfectly well without them, so remove the dummy routines from libsas which tried to emulate them (but only ended up causing confusion). Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/libsas')
-rw-r--r--drivers/scsi/libsas/sas_ata.c51
1 files changed, 0 insertions, 51 deletions
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 4a6e203861d2..c2a5cc75b407 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -301,55 +301,6 @@ static void sas_ata_post_internal(struct ata_queued_cmd *qc)
301 } 301 }
302} 302}
303 303
304static int sas_ata_scr_write(struct ata_link *link, unsigned int sc_reg_in,
305 u32 val)
306{
307 struct domain_device *dev = link->ap->private_data;
308
309 SAS_DPRINTK("STUB %s\n", __func__);
310 switch (sc_reg_in) {
311 case SCR_STATUS:
312 dev->sata_dev.sstatus = val;
313 break;
314 case SCR_CONTROL:
315 dev->sata_dev.scontrol = val;
316 break;
317 case SCR_ERROR:
318 dev->sata_dev.serror = val;
319 break;
320 case SCR_ACTIVE:
321 dev->sata_dev.ap->link.sactive = val;
322 break;
323 default:
324 return -EINVAL;
325 }
326 return 0;
327}
328
329static int sas_ata_scr_read(struct ata_link *link, unsigned int sc_reg_in,
330 u32 *val)
331{
332 struct domain_device *dev = link->ap->private_data;
333
334 SAS_DPRINTK("STUB %s\n", __func__);
335 switch (sc_reg_in) {
336 case SCR_STATUS:
337 *val = dev->sata_dev.sstatus;
338 return 0;
339 case SCR_CONTROL:
340 *val = dev->sata_dev.scontrol;
341 return 0;
342 case SCR_ERROR:
343 *val = dev->sata_dev.serror;
344 return 0;
345 case SCR_ACTIVE:
346 *val = dev->sata_dev.ap->link.sactive;
347 return 0;
348 default:
349 return -EINVAL;
350 }
351}
352
353static struct ata_port_operations sas_sata_ops = { 304static struct ata_port_operations sas_sata_ops = {
354 .phy_reset = sas_ata_phy_reset, 305 .phy_reset = sas_ata_phy_reset,
355 .post_internal_cmd = sas_ata_post_internal, 306 .post_internal_cmd = sas_ata_post_internal,
@@ -359,8 +310,6 @@ static struct ata_port_operations sas_sata_ops = {
359 .qc_fill_rtf = sas_ata_qc_fill_rtf, 310 .qc_fill_rtf = sas_ata_qc_fill_rtf,
360 .port_start = ata_sas_port_start, 311 .port_start = ata_sas_port_start,
361 .port_stop = ata_sas_port_stop, 312 .port_stop = ata_sas_port_stop,
362 .scr_read = sas_ata_scr_read,
363 .scr_write = sas_ata_scr_write
364}; 313};
365 314
366static struct ata_port_info sata_port_info = { 315static struct ata_port_info sata_port_info = {