tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mei: Use dev_get_drvdata where possible

Instead of using to_pci_dev + pci_get_drvdata,
use dev_get_drvdata to make code simpler.

Signed-off-by: Chuhong Yuan <hslester96@gmail.com>
Link: https://lore.kernel.org/r/20190723124627.24671-1-hslester96@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Chuhong Yuan and committed by
Greg Kroah-Hartman ab81f3f3 75080370

+16 -22
+8 -11
drivers/misc/mei/pci-me.c
··· 381 381 #ifdef CONFIG_PM 382 382 static int mei_me_pm_runtime_idle(struct device *device) 383 383 { 384 - struct pci_dev *pdev = to_pci_dev(device); 385 384 struct mei_device *dev; 386 385 387 - dev_dbg(&pdev->dev, "rpm: me: runtime_idle\n"); 386 + dev_dbg(device, "rpm: me: runtime_idle\n"); 388 387 389 - dev = pci_get_drvdata(pdev); 388 + dev = dev_get_drvdata(device); 390 389 if (!dev) 391 390 return -ENODEV; 392 391 if (mei_write_is_idle(dev)) ··· 396 397 397 398 static int mei_me_pm_runtime_suspend(struct device *device) 398 399 { 399 - struct pci_dev *pdev = to_pci_dev(device); 400 400 struct mei_device *dev; 401 401 int ret; 402 402 403 - dev_dbg(&pdev->dev, "rpm: me: runtime suspend\n"); 403 + dev_dbg(device, "rpm: me: runtime suspend\n"); 404 404 405 - dev = pci_get_drvdata(pdev); 405 + dev = dev_get_drvdata(device); 406 406 if (!dev) 407 407 return -ENODEV; 408 408 ··· 414 416 415 417 mutex_unlock(&dev->device_lock); 416 418 417 - dev_dbg(&pdev->dev, "rpm: me: runtime suspend ret=%d\n", ret); 419 + dev_dbg(device, "rpm: me: runtime suspend ret=%d\n", ret); 418 420 419 421 if (ret && ret != -EAGAIN) 420 422 schedule_work(&dev->reset_work); ··· 424 426 425 427 static int mei_me_pm_runtime_resume(struct device *device) 426 428 { 427 - struct pci_dev *pdev = to_pci_dev(device); 428 429 struct mei_device *dev; 429 430 int ret; 430 431 431 - dev_dbg(&pdev->dev, "rpm: me: runtime resume\n"); 432 + dev_dbg(device, "rpm: me: runtime resume\n"); 432 433 433 - dev = pci_get_drvdata(pdev); 434 + dev = dev_get_drvdata(device); 434 435 if (!dev) 435 436 return -ENODEV; 436 437 ··· 439 442 440 443 mutex_unlock(&dev->device_lock); 441 444 442 - dev_dbg(&pdev->dev, "rpm: me: runtime resume ret = %d\n", ret); 445 + dev_dbg(device, "rpm: me: runtime resume ret = %d\n", ret); 443 446 444 447 if (ret) 445 448 schedule_work(&dev->reset_work);
+8 -11
drivers/misc/mei/pci-txe.c
··· 276 276 #ifdef CONFIG_PM 277 277 static int mei_txe_pm_runtime_idle(struct device *device) 278 278 { 279 - struct pci_dev *pdev = to_pci_dev(device); 280 279 struct mei_device *dev; 281 280 282 - dev_dbg(&pdev->dev, "rpm: txe: runtime_idle\n"); 281 + dev_dbg(device, "rpm: txe: runtime_idle\n"); 283 282 284 - dev = pci_get_drvdata(pdev); 283 + dev = dev_get_drvdata(device); 285 284 if (!dev) 286 285 return -ENODEV; 287 286 if (mei_write_is_idle(dev)) ··· 290 291 } 291 292 static int mei_txe_pm_runtime_suspend(struct device *device) 292 293 { 293 - struct pci_dev *pdev = to_pci_dev(device); 294 294 struct mei_device *dev; 295 295 int ret; 296 296 297 - dev_dbg(&pdev->dev, "rpm: txe: runtime suspend\n"); 297 + dev_dbg(device, "rpm: txe: runtime suspend\n"); 298 298 299 - dev = pci_get_drvdata(pdev); 299 + dev = dev_get_drvdata(device); 300 300 if (!dev) 301 301 return -ENODEV; 302 302 ··· 308 310 309 311 /* keep irq on we are staying in D0 */ 310 312 311 - dev_dbg(&pdev->dev, "rpm: txe: runtime suspend ret=%d\n", ret); 313 + dev_dbg(device, "rpm: txe: runtime suspend ret=%d\n", ret); 312 314 313 315 mutex_unlock(&dev->device_lock); 314 316 ··· 320 322 321 323 static int mei_txe_pm_runtime_resume(struct device *device) 322 324 { 323 - struct pci_dev *pdev = to_pci_dev(device); 324 325 struct mei_device *dev; 325 326 int ret; 326 327 327 - dev_dbg(&pdev->dev, "rpm: txe: runtime resume\n"); 328 + dev_dbg(device, "rpm: txe: runtime resume\n"); 328 329 329 - dev = pci_get_drvdata(pdev); 330 + dev = dev_get_drvdata(device); 330 331 if (!dev) 331 332 return -ENODEV; 332 333 ··· 337 340 338 341 mutex_unlock(&dev->device_lock); 339 342 340 - dev_dbg(&pdev->dev, "rpm: txe: runtime resume ret = %d\n", ret); 343 + dev_dbg(device, "rpm: txe: runtime resume ret = %d\n", ret); 341 344 342 345 if (ret) 343 346 schedule_work(&dev->reset_work);